From fcdefc3f412d528f501f74d9fb2c23eca4ef7d13 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 14 Dec 2008 13:22:51 +0000 Subject: [PATCH] --- yaml --- r: 123716 b: refs/heads/master c: a02f45cfca97dcf97c03b32603ec2399bf006605 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/mtd-xip.h | 1 - trunk/arch/arm/mach-pxa/include/mach/mtd-xip.h | 1 + trunk/arch/arm/mach-sa1100/include/mach/mtd-xip.h | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca3334b61d50..99f015798f37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ce1b871db6a3ca69ed1e35956d89d3cacd7ba08 +refs/heads/master: a02f45cfca97dcf97c03b32603ec2399bf006605 diff --git a/trunk/arch/arm/include/asm/mtd-xip.h b/trunk/arch/arm/include/asm/mtd-xip.h index d8fbe2d9b8b9..d79d66d2cf71 100644 --- a/trunk/arch/arm/include/asm/mtd-xip.h +++ b/trunk/arch/arm/include/asm/mtd-xip.h @@ -15,7 +15,6 @@ #ifndef __ARM_MTD_XIP_H__ #define __ARM_MTD_XIP_H__ -#include #include /* fill instruction prefetch */ diff --git a/trunk/arch/arm/mach-pxa/include/mach/mtd-xip.h b/trunk/arch/arm/mach-pxa/include/mach/mtd-xip.h index 4d452fcb1508..cfca8155be72 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/trunk/arch/arm/mach-pxa/include/mach/mtd-xip.h @@ -15,6 +15,7 @@ #ifndef __ARCH_PXA_MTD_XIP_H__ #define __ARCH_PXA_MTD_XIP_H__ +#include #include #define xip_irqpending() (ICIP & ICMR) diff --git a/trunk/arch/arm/mach-sa1100/include/mach/mtd-xip.h b/trunk/arch/arm/mach-sa1100/include/mach/mtd-xip.h index eaa09e86ad16..b3d684098fbf 100644 --- a/trunk/arch/arm/mach-sa1100/include/mach/mtd-xip.h +++ b/trunk/arch/arm/mach-sa1100/include/mach/mtd-xip.h @@ -15,6 +15,8 @@ #ifndef __ARCH_SA1100_MTD_XIP_H__ #define __ARCH_SA1100_MTD_XIP_H__ +#include + #define xip_irqpending() (ICIP & ICMR) /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */