]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: No need to include board-h3.h from hardware.h
authorTony Lindgren <tony@atomide.com>
Tue, 24 Mar 2009 01:07:33 +0000 (18:07 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 24 Mar 2009 01:07:33 +0000 (18:07 -0700)
Also move board-h3.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/board-h3-mmc.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-h3.h [moved from arch/arm/plat-omap/include/mach/board-h3.h with 90% similarity]
arch/arm/plat-omap/include/mach/hardware.h

index fdfe793d56f2893e61d025ab63113846dc3ef51c..0d8a3c195e2e01872efd43394e333dea2f7aa43d 100644 (file)
@@ -19,6 +19,8 @@
 #include <mach/mmc.h>
 #include <mach/gpio.h>
 
+#include "board-h3.h"
+
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 
 static int mmc_set_power(struct device *dev, int slot, int power_on,
index bf08b6ad22eef530cf5c04e10229376ada2fd3f0..4b872f3822b5b9211f67434101318bd7107f6b0a 100644 (file)
 #include <mach/dma.h>
 #include <mach/common.h>
 
+#include "board-h3.h"
+
+/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */
+#define OMAP1710_ETHR_START            0x04000300
+
 #define H3_TS_GPIO     48
 
 static int h3_keymap[] = {
similarity index 90%
rename from arch/arm/plat-omap/include/mach/board-h3.h
rename to arch/arm/mach-omap1/board-h3.h
index 1888326da7ea325805f4052a8230439ecf1b235e..78de535be3c55dcab21e560d2b4bda765080323a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * arch/arm/plat-omap/include/mach/board-h3.h
+ * arch/arm/mach-omap1/board-h3.h
  *
  * Copyright (C) 2001 RidgeRun, Inc.
  * Copyright (C) 2004 Texas Instruments, Inc.
@@ -27,9 +27,6 @@
 #ifndef __ASM_ARCH_OMAP_H3_H
 #define __ASM_ARCH_OMAP_H3_H
 
-/* In OMAP1710 H3 the Ethernet is directly connected to CS1 */
-#define OMAP1710_ETHR_START            0x04000300
-
 #define H3_TPS_GPIO_BASE               (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)
 #      define H3_TPS_GPIO_MMC_PWR_EN   (H3_TPS_GPIO_BASE + 4)
 
index ac4d8d0515573d1365a1af779254bcd288f3855f..040244cc719384587c67b7598a3ea2803231cc71 100644 (file)
 #include "board-innovator.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_H3
-#include "board-h3.h"
-#endif
-
 #ifdef CONFIG_MACH_OMAP_H4
 #include "board-h4.h"
 #endif