diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:30:08 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:30:08 +0000 |
| commit | 56f54e7d671969da13693e5a147438f2cc50ca9b (patch) | |
| tree | 888fa7296d34d26354ae20e8391dac880406d942 /arch/arm/mach-mmp/include | |
| parent | d92c9d5b38cd2932de463df1afa7a67fbf9207ef (diff) | |
| parent | e4b3bbe31d9a1e9540c6e9c95f5e7fd92acbcacf (diff) | |
| download | linux-56f54e7d671969da13693e5a147438f2cc50ca9b.tar.gz linux-56f54e7d671969da13693e5a147438f2cc50ca9b.tar.bz2 linux-56f54e7d671969da13693e5a147438f2cc50ca9b.zip | |
Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
Diffstat (limited to 'arch/arm/mach-mmp/include')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/gpio-pxa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/gpio-pxa.h b/arch/arm/mach-mmp/include/mach/gpio-pxa.h index d14eeaf16322..99b4ce1b6562 100644 --- 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_REG(x) (GPIO_REGS_VIRT + (x)) +#define GPIO_REG(x) (*(volatile u32 *)(GPIO_REGS_VIRT + (x))) #define NR_BUILTIN_GPIO IRQ_GPIO_NUM |