From 578a817b781f75de93064e28245abc4053511074 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Wed, 9 Nov 2011 10:47:21 +0800 Subject: [PATCH] --- yaml --- r: 276076 b: refs/heads/master c: 22f4cb4bd06db14912f69039917422fe0c5b11fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mmp/include/mach/gpio-pxa.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 06a9a17adf70..b43dfc76982b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0a39151a4055332897cba615623d3de2f3896df +refs/heads/master: 22f4cb4bd06db14912f69039917422fe0c5b11fb diff --git a/trunk/arch/arm/mach-mmp/include/mach/gpio-pxa.h b/trunk/arch/arm/mach-mmp/include/mach/gpio-pxa.h index d14eeaf16322..99b4ce1b6562 100644 --- a/trunk/arch/arm/mach-mmp/include/mach/gpio-pxa.h +++ b/trunk/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