---

yaml --- r: 137472 b: refs/heads/master c: 40662d7 h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · f767af5 · f767af5
1 parent 2e32a79
commit f767af5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 44 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7055477558686e106149bf0bb0edc0f5cd848ad9
+refs/heads/master: 40662d77311d8de3a26c33f2fd5a2d4d810a4c8a
diff --git a/trunk/arch/arm/mach-omap2/board-h4.c b/trunk/arch/arm/mach-omap2/board-h4.c
@@ -47,6 +47,8 @@
 #define H4_FLASH_CS	0
 #define H4_SMC91X_CS	1
 
+#define H4_ETHR_GPIO_IRQ		92
+
 static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 };
 static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 };
 
@@ -341,7 +343,7 @@ static inline void __init h4_init_debug(void)
 	udelay(100);
 
 	omap_cfg_reg(M15_24XX_GPIO92);
-	if (debug_card_init(cs_mem_base, OMAP24XX_ETHR_GPIO_IRQ) < 0)
+	if (debug_card_init(cs_mem_base, H4_ETHR_GPIO_IRQ) < 0)
 		gpmc_cs_free(eth_cs);
 
 out:

diff --git a/trunk/arch/arm/plat-omap/include/mach/board-h4.h b/trunk/arch/arm/plat-omap/include/mach/board-h4.h
diff --git a/trunk/arch/arm/plat-omap/include/mach/hardware.h b/trunk/arch/arm/plat-omap/include/mach/hardware.h
@@ -294,10 +294,6 @@
  * ---------------------------------------------------------------------------
  */
 
-#ifdef CONFIG_MACH_OMAP_H4
-#include "board-h4.h"
-#endif
-
 #ifdef CONFIG_MACH_OMAP3_BEAGLE
 #include "board-omap3beagle.h"
 #endif