diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-03-23 18:07:33 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-03-23 18:07:33 -0700 |
| commit | eb6b0b1832a779cfa65bb66b8a88454d988a1d69 (patch) | |
| tree | 5342fe010ef08dec8df449be200b4663c3b7be10 | |
| parent | d9558b19f2d1f01f6a11e148405cd3af63b8d6a8 (diff) | |
| download | linux-eb6b0b1832a779cfa65bb66b8a88454d988a1d69.tar.bz2 | |
ARM: OMAP: No need to include board-h2.h from hardware.h
Also move board-h2.h to mach-omap1.
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap1/board-h2-mmc.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.h (renamed from arch/arm/plat-omap/include/mach/board-h2.h) | 5 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/mach/hardware.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c index 409fa56d0a87..44d4a966bed9 100644 --- a/arch/arm/mach-omap1/board-h2-mmc.c +++ b/arch/arm/mach-omap1/board-h2-mmc.c @@ -19,6 +19,8 @@ #include <mach/mmc.h> #include <mach/gpio.h> +#include "board-h2.h" + #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) static int mmc_set_power(struct device *dev, int slot, int power_on, diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 0d784a795092..b31b6d9b2e3f 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -46,6 +46,11 @@ #include <mach/keypad.h> #include <mach/common.h> +#include "board-h2.h" + +/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ +#define OMAP1610_ETHR_START 0x04000300 + static int h2_keymap[] = { KEY(0, 0, KEY_LEFT), KEY(0, 1, KEY_RIGHT), diff --git a/arch/arm/plat-omap/include/mach/board-h2.h b/arch/arm/mach-omap1/board-h2.h index 15531c8dc0e6..315e2662547e 100644 --- a/arch/arm/plat-omap/include/mach/board-h2.h +++ b/arch/arm/mach-omap1/board-h2.h @@ -1,5 +1,5 @@ /* - * arch/arm/plat-omap/include/mach/board-h2.h + * arch/arm/mach-omap1/board-h2.h * * Hardware definitions for TI OMAP1610 H2 board. * @@ -29,9 +29,6 @@ #ifndef __ASM_ARCH_OMAP_H2_H #define __ASM_ARCH_OMAP_H2_H -/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ -#define OMAP1610_ETHR_START 0x04000300 - #define H2_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) # define H2_TPS_GPIO_MMC_PWR_EN (H2_TPS_GPIO_BASE + 3) diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 5b59188eceae..ac4d8d051557 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h @@ -298,10 +298,6 @@ #include "board-innovator.h" #endif -#ifdef CONFIG_MACH_OMAP_H2 -#include "board-h2.h" -#endif - #ifdef CONFIG_MACH_OMAP_H3 #include "board-h3.h" #endif |