]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Dec 2008 13:22:51 +0000 (13:22 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Dec 2008 13:22:51 +0000 (13:22 +0000)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/mtd-xip.h
arch/arm/mach-pxa/include/mach/mtd-xip.h
arch/arm/mach-sa1100/include/mach/mtd-xip.h

index d8fbe2d9b8b9b3621bbe910b56ccde369123f73f..d79d66d2cf715ffa4f25b7c3f0b06ced68db6cff 100644 (file)
@@ -15,7 +15,6 @@
 #ifndef __ARM_MTD_XIP_H__
 #define __ARM_MTD_XIP_H__
 
-#include <mach/hardware.h>
 #include <mach/mtd-xip.h>
 
 /* fill instruction prefetch */
index 4d452fcb15086317ea5f1639aee75ec4981624fa..cfca8155be7232b294e72c3cf407e1c349f8c723 100644 (file)
@@ -15,6 +15,7 @@
 #ifndef __ARCH_PXA_MTD_XIP_H__
 #define __ARCH_PXA_MTD_XIP_H__
 
+#include <mach/hardware.h>
 #include <mach/pxa-regs.h>
 
 #define xip_irqpending()       (ICIP & ICMR)
index eaa09e86ad16befdc834ba870435fc7917736f49..b3d684098fbf545c033e56793935cee7da3e2bf0 100644 (file)
@@ -15,6 +15,8 @@
 #ifndef __ARCH_SA1100_MTD_XIP_H__
 #define __ARCH_SA1100_MTD_XIP_H__
 
+#include <mach/hardware.h>
+
 #define xip_irqpending()       (ICIP & ICMR)
 
 /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */