git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
gpio.c
diff --git
a/arch/arm/mach-at91/gpio.c
b/arch/arm/mach-at91/gpio.c
index
7b87f3f
..
44211a0
100644
(file)
--- a/
arch/arm/mach-at91/gpio.c
+++ b/
arch/arm/mach-at91/gpio.c
@@
-210,7
+210,7
@@
int gpio_direction_input(unsigned pin)
if (!pio || !(__raw_readl(pio + PIO_PSR) & mask))
return -EINVAL;
- __raw_writel(mask, pio + PIO_O
E
R);
+ __raw_writel(mask, pio + PIO_O
D
R);
return 0;
}
EXPORT_SYMBOL(gpio_direction_input);