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

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

[Steve Sakoman]

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@sakoman.com>
---
 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

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

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 09326670a22ee0e89d73cb7dd8773cf7b1e93c5e

PatchWorks
http://patchwork.kernel.org/patch/17873/

Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=09326670a22ee0e89d73cb7dd8773cf7b1e93c5e