diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-14 08:22:51 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-14 08:22:51 -0500 |
commit | a02f45cfca97dcf97c03b32603ec2399bf006605 (patch) | |
tree | eb8332cb5e55e02a61f7a69bf2494c3440651c5e /arch/arm/mach-sa1100/include | |
parent | 6ce1b871db6a3ca69ed1e35956d89d3cacd7ba08 (diff) |
[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/include')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/mtd-xip.h | 2 |
1 files changed, 2 insertions, 0 deletions
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) */ |