diff --git a/[refs] b/[refs] index 59e6a236eabd..e834de75e1bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fc7ae3c849a5a15965c1d41b59b0a606119e71a +refs/heads/master: 7124cb96cadc5f9990ade39780b672b01bfc6484 diff --git a/trunk/arch/arm/mach-pxa/include/mach/gpio-pxa.h b/trunk/arch/arm/mach-pxa/include/mach/gpio-pxa.h index 576868f8b8c5..41b4c93a96c2 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/gpio-pxa.h +++ b/trunk/arch/arm/mach-pxa/include/mach/gpio-pxa.h @@ -25,7 +25,7 @@ #define GPIO_REGS_VIRT io_p2v(0x40E00000) #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))) /* GPIO Pin Level Registers */ #define GPLR0 GPIO_REG(BANK_OFF(0) + 0x00)