diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 16:26:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 16:26:37 -0400 |
| commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
| tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-mmp/mmp2.c | |
| parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
| parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) | |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-mmp/mmp2.c')
| -rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index 079c18861d5..a80cbea4049 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c | |||
| @@ -87,7 +87,8 @@ static struct mfp_addr_map mmp2_addr_map[] __initdata = { | |||
| 87 | 87 | ||
| 88 | void mmp2_clear_pmic_int(void) | 88 | void mmp2_clear_pmic_int(void) |
| 89 | { | 89 | { |
| 90 | unsigned long mfpr_pmic, data; | 90 | void __iomem *mfpr_pmic; |
| 91 | unsigned long data; | ||
| 91 | 92 | ||
| 92 | mfpr_pmic = APB_VIRT_BASE + 0x1e000 + 0x2c4; | 93 | mfpr_pmic = APB_VIRT_BASE + 0x1e000 + 0x2c4; |
| 93 | data = __raw_readl(mfpr_pmic); | 94 | data = __raw_readl(mfpr_pmic); |