summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include/mach/mtd-xip.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-02 00:03:45 +0400
committerEric Miao <eric.y.miao@gmail.com>2011-10-08 17:03:07 +0400
commit97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110 (patch)
tree34c80d050a0cc8538d0fc22213772560dc3db2f3 /arch/arm/mach-pxa/include/mach/mtd-xip.h
parent7272889d3f40ed6aa2ade32bed5834789b3299cc (diff)
downloadlinux-97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110.tar.xz
ARM: pxa: use correct __iomem annotations
This tries to clear up the confusion between integers and iomem pointers in the marvell pxa platform. MMIO addresses are supposed to be __iomem* values, in order to let the Linux type checking work correctly. This patch moves the cast to __iomem as far back as possible, to the place where the MMIO virtual address windows are defined. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/mtd-xip.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/mtd-xip.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h
index 297387ec3618..990d2bf2fb45 100644
--- a/arch/arm/mach-pxa/include/mach/mtd-xip.h
+++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h
@@ -16,7 +16,6 @@
#define __ARCH_PXA_MTD_XIP_H__
#include <mach/regs-ost.h>
-#include <mach/regs-intc.h>
#define xip_irqpending() (ICIP & ICMR)