Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP: No need to include board-h3.h from hardware.h

Also move board-h3.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>

+8 -8
+2
arch/arm/mach-omap1/board-h3-mmc.c
··· 19 19 #include <mach/mmc.h> 20 20 #include <mach/gpio.h> 21 21 22 + #include "board-h3.h" 23 + 22 24 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) 23 25 24 26 static int mmc_set_power(struct device *dev, int slot, int power_on,
+5
arch/arm/mach-omap1/board-h3.c
··· 50 50 #include <mach/dma.h> 51 51 #include <mach/common.h> 52 52 53 + #include "board-h3.h" 54 + 55 + /* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ 56 + #define OMAP1710_ETHR_START 0x04000300 57 + 53 58 #define H3_TS_GPIO 48 54 59 55 60 static int h3_keymap[] = {
+1 -4
arch/arm/plat-omap/include/mach/board-h3.h arch/arm/mach-omap1/board-h3.h
··· 1 1 /* 2 - * arch/arm/plat-omap/include/mach/board-h3.h 2 + * arch/arm/mach-omap1/board-h3.h 3 3 * 4 4 * Copyright (C) 2001 RidgeRun, Inc. 5 5 * Copyright (C) 2004 Texas Instruments, Inc. ··· 26 26 */ 27 27 #ifndef __ASM_ARCH_OMAP_H3_H 28 28 #define __ASM_ARCH_OMAP_H3_H 29 - 30 - /* In OMAP1710 H3 the Ethernet is directly connected to CS1 */ 31 - #define OMAP1710_ETHR_START 0x04000300 32 29 33 30 #define H3_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) 34 31 # define H3_TPS_GPIO_MMC_PWR_EN (H3_TPS_GPIO_BASE + 4)
-4
arch/arm/plat-omap/include/mach/hardware.h
··· 298 298 #include "board-innovator.h" 299 299 #endif 300 300 301 - #ifdef CONFIG_MACH_OMAP_H3 302 - #include "board-h3.h" 303 - #endif 304 - 305 301 #ifdef CONFIG_MACH_OMAP_H4 306 302 #include "board-h4.h" 307 303 #endif