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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.

Signed-off-by: Steve Sakoman <steve@xxxxxxxxxxx>
---
 arch/arm/mach-omap2/board-overo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-overo.c
b/arch/arm/mach-omap2/board-overo.c
index f357de9..3a9c519 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -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();

-- 
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux