diff options
-rw-r--r-- | arch/arm/include/asm/mtd-xip.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/mtd-xip.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/mtd-xip.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h index d8fbe2d9b8b9..d79d66d2cf71 100644 --- a/arch/arm/include/asm/mtd-xip.h +++ b/arch/arm/include/asm/mtd-xip.h | |||
@@ -15,7 +15,6 @@ | |||
15 | #ifndef __ARM_MTD_XIP_H__ | 15 | #ifndef __ARM_MTD_XIP_H__ |
16 | #define __ARM_MTD_XIP_H__ | 16 | #define __ARM_MTD_XIP_H__ |
17 | 17 | ||
18 | #include <mach/hardware.h> | ||
19 | #include <mach/mtd-xip.h> | 18 | #include <mach/mtd-xip.h> |
20 | 19 | ||
21 | /* fill instruction prefetch */ | 20 | /* fill instruction prefetch */ |
diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index 4d452fcb1508..cfca8155be72 100644 --- a/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #ifndef __ARCH_PXA_MTD_XIP_H__ | 15 | #ifndef __ARCH_PXA_MTD_XIP_H__ |
16 | #define __ARCH_PXA_MTD_XIP_H__ | 16 | #define __ARCH_PXA_MTD_XIP_H__ |
17 | 17 | ||
18 | #include <mach/hardware.h> | ||
18 | #include <mach/pxa-regs.h> | 19 | #include <mach/pxa-regs.h> |
19 | 20 | ||
20 | #define xip_irqpending() (ICIP & ICMR) | 21 | #define xip_irqpending() (ICIP & ICMR) |
diff --git a/arch/arm/mach-sa1100/include/mach/mtd-xip.h b/arch/arm/mach-sa1100/include/mach/mtd-xip.h index eaa09e86ad16..b3d684098fbf 100644 --- a/arch/arm/mach-sa1100/include/mach/mtd-xip.h +++ b/arch/arm/mach-sa1100/include/mach/mtd-xip.h | |||
@@ -15,6 +15,8 @@ | |||
15 | #ifndef __ARCH_SA1100_MTD_XIP_H__ | 15 | #ifndef __ARCH_SA1100_MTD_XIP_H__ |
16 | #define __ARCH_SA1100_MTD_XIP_H__ | 16 | #define __ARCH_SA1100_MTD_XIP_H__ |
17 | 17 | ||
18 | #include <mach/hardware.h> | ||
19 | |||
18 | #define xip_irqpending() (ICIP & ICMR) | 20 | #define xip_irqpending() (ICIP & ICMR) |
19 | 21 | ||
20 | /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ | 22 | /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ |