浏览代码

ARM: omap1: make headers more local

Some header files are never included outside of a mach-omap1
directory and do not need to be made visible in include/mach,
so let's just move them all down one level.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Arnd Bergmann 10 年之前
父节点
当前提交
100f9638fe

+ 1 - 1
arch/arm/mach-omap1/board-ams-delta.c

@@ -41,7 +41,7 @@
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>
 #include <mach/ams-delta-fiq.h>
-#include <mach/camera.h>
+#include "camera.h"
 #include <mach/usb.h>
 #include <mach/usb.h>
 
 
 #include "iomap.h"
 #include "iomap.h"

+ 1 - 1
arch/arm/mach-omap1/board-fsample.c

@@ -29,7 +29,7 @@
 
 
 #include <mach/tc.h>
 #include <mach/tc.h>
 #include <mach/mux.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/platform_data/keypad-omap.h>
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>

+ 1 - 1
arch/arm/mach-omap1/board-h2.c

@@ -42,7 +42,7 @@
 #include <linux/omap-dma.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/platform_data/keypad-omap.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 #include <mach/usb.h>
 #include <mach/usb.h>

+ 1 - 1
arch/arm/mach-omap1/board-h3.c

@@ -44,7 +44,7 @@
 #include <mach/tc.h>
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/omap-dma.h>
 #include <linux/omap-dma.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/irqs.h>

+ 1 - 1
arch/arm/mach-omap1/board-innovator.c

@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 
 
 #include <mach/mux.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/tc.h>
 #include <mach/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <linux/platform_data/keypad-omap.h>
 
 

+ 1 - 1
arch/arm/mach-omap1/board-osk.c

@@ -46,7 +46,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/mux.h>
 #include <mach/tc.h>
 #include <mach/tc.h>
 
 

+ 1 - 1
arch/arm/mach-omap1/board-palmte.c

@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/mux.h>
 #include <mach/tc.h>
 #include <mach/tc.h>
 #include <linux/omap-dma.h>
 #include <linux/omap-dma.h>

+ 1 - 1
arch/arm/mach-omap1/board-palmtt.c

@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
 #include <mach/tc.h>

+ 1 - 1
arch/arm/mach-omap1/board-palmz71.c

@@ -36,7 +36,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
 #include <mach/tc.h>

+ 1 - 1
arch/arm/mach-omap1/board-perseus2.c

@@ -30,7 +30,7 @@
 
 
 #include <mach/tc.h>
 #include <mach/tc.h>
 #include <mach/mux.h>
 #include <mach/mux.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 
 

+ 1 - 1
arch/arm/mach-omap1/board-sx1-mmc.c

@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
-#include <mach/board-sx1.h>
+#include "board-sx1.h"
 
 
 #include "mmc.h"
 #include "mmc.h"
 
 

+ 2 - 2
arch/arm/mach-omap1/board-sx1.c

@@ -34,11 +34,11 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 
 
-#include <mach/flash.h>
+#include "flash.h"
 #include <mach/mux.h>
 #include <mach/mux.h>
 #include <linux/omap-dma.h>
 #include <linux/omap-dma.h>
 #include <mach/tc.h>
 #include <mach/tc.h>
-#include <mach/board-sx1.h>
+#include "board-sx1.h"
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 #include <mach/usb.h>
 #include <mach/usb.h>

+ 0 - 0
arch/arm/mach-omap1/include/mach/board-sx1.h → arch/arm/mach-omap1/board-sx1.h


+ 0 - 0
arch/arm/mach-omap1/include/mach/camera.h → arch/arm/mach-omap1/camera.h


+ 1 - 1
arch/arm/mach-omap1/devices.c

@@ -25,7 +25,7 @@
 #include <mach/mux.h>
 #include <mach/mux.h>
 
 
 #include <mach/omap7xx.h>
 #include <mach/omap7xx.h>
-#include <mach/camera.h>
+#include "camera.h"
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 
 
 #include "common.h"
 #include "common.h"

+ 1 - 1
arch/arm/mach-omap1/flash.c

@@ -11,7 +11,7 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/map.h>
 
 
 #include <mach/tc.h>
 #include <mach/tc.h>
-#include <mach/flash.h>
+#include "flash.h"
 
 
 #include <mach/hardware.h>
 #include <mach/hardware.h>
 
 

+ 0 - 0
arch/arm/mach-omap1/include/mach/flash.h → arch/arm/mach-omap1/flash.h