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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
include
/
mach
/
gpio-pxa.h
diff --git
a/arch/arm/mach-mmp/include/mach/gpio-pxa.h
b/arch/arm/mach-mmp/include/mach/gpio-pxa.h
index
d14eeaf
..
99b4ce1
100644
(file)
--- a/
arch/arm/mach-mmp/include/mach/gpio-pxa.h
+++ b/
arch/arm/mach-mmp/include/mach/gpio-pxa.h
@@
-7,7
+7,7
@@
#define GPIO_REGS_VIRT (APB_VIRT_BASE + 0x19000)
#define BANK_OFF(n) (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
#define GPIO_REGS_VIRT (APB_VIRT_BASE + 0x19000)
#define BANK_OFF(n) (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
-#define GPIO_REG(x) (
GPIO_REGS_VIRT + (x
))
+#define GPIO_REG(x) (
*(volatile u32 *)(GPIO_REGS_VIRT + (x)
))
#define NR_BUILTIN_GPIO IRQ_GPIO_NUM
#define NR_BUILTIN_GPIO IRQ_GPIO_NUM