Skip to contentSkip to conversation

ARM: OMAP: Fix merge errors in board-overo.c

PATCH New Steve Sakoman 2 participants 2 messages Apr 13, 2009 – Apr 15, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP: Fix merge errors in board-overo.c

One line was omitted when moving definitions from board-overo.h to board-overo.c, and a duplicate overo_init_smsc911x call was added to overo_init.

The former results in a compiler error.

---
 arch/arm/mach-omap2/board-overo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-omap2/board-overo.c
index f357de9..3a9c519 100644

arch/arm/mach-omap2/board-overo.c +1 -1
@@ -52,6 +52,7 @@
 
 #define OVERO_GPIO_BT_XGATE	15
 #define OVERO_GPIO_W2W_NRESET	16
+#define OVERO_GPIO_PENDOWN	114
 #define OVERO_GPIO_BT_NRESET	164
 #define OVERO_GPIO_USBH_CPEN	168
 #define OVERO_GPIO_USBH_NRESET	183
@@ -397,7 +398,6 @@ static void __init overo_init(void)
 	usb_musb_init();
 	usb_ehci_init();
 	overo_flash_init();
-	overo_init_smsc911x();
 	overo_ads7846_init();
 	overo_init_smsc911x();
 
Signature · 1 line
1.5.6.3