---

yaml --- r: 137473 b: refs/heads/master c: ec7558a h: refs/heads/master i: 137471: 2e32a79 v: v3
git-mirror · Mar 24, 2009 · 294f470 · 294f470
1 parent f767af5
commit 294f470
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 48 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40662d77311d8de3a26c33f2fd5a2d4d810a4c8a
+refs/heads/master: ec7558a62d2e28ec607fdfab1cd39b475d929ce5
diff --git a/trunk/arch/arm/mach-omap2/board-ldp.c b/trunk/arch/arm/mach-omap2/board-ldp.c
@@ -28,7 +28,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/board-ldp.h>
 #include <mach/mcspi.h>
 #include <mach/gpio.h>
 #include <mach/board.h>
@@ -41,12 +40,15 @@
 
 #include "mmc-twl4030.h"
 
-#define SDP3430_SMC91X_CS	3
+#define LDP_SMC911X_CS		1
+#define LDP_SMC911X_GPIO	152
+#define DEBUG_BASE		0x08000000
+#define LDP_ETHR_START		DEBUG_BASE
 
 static struct resource ldp_smc911x_resources[] = {
 	[0] = {
-		.start	= OMAP34XX_ETHR_START,
-		.end	= OMAP34XX_ETHR_START + SZ_4K,
+		.start	= LDP_ETHR_START,
+		.end	= LDP_ETHR_START + SZ_4K,
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {

diff --git a/trunk/arch/arm/plat-omap/include/mach/board-ldp.h b/trunk/arch/arm/plat-omap/include/mach/board-ldp.h
diff --git a/trunk/arch/arm/plat-omap/include/mach/hardware.h b/trunk/arch/arm/plat-omap/include/mach/hardware.h
@@ -298,10 +298,6 @@
 #include "board-omap3beagle.h"
 #endif
 
-#ifdef CONFIG_MACH_OMAP_LDP
-#include "board-ldp.h"
-#endif
-
 #ifdef CONFIG_MACH_VOICEBLUE
 #include "board-voiceblue.h"
 #endif