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 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
mmp2.c
diff --git
a/arch/arm/mach-mmp/mmp2.c
b/arch/arm/mach-mmp/mmp2.c
index
65d8689
..
7a7e8e4
100644
(file)
--- a/
arch/arm/mach-mmp/mmp2.c
+++ b/
arch/arm/mach-mmp/mmp2.c
@@
-86,7
+86,8
@@
static struct mfp_addr_map mmp2_addr_map[] __initdata = {
void mmp2_clear_pmic_int(void)
{
- unsigned long mfpr_pmic, data;
+ void __iomem *mfpr_pmic;
+ unsigned long data;
mfpr_pmic = APB_VIRT_BASE + 0x1e000 + 0x2c4;
data = __raw_readl(mfpr_pmic);