ARM: OMAP: Fix merge errors in board-overo.c
Subsystems (3)
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.
Signed-off-by Steve Sakoman <[email protected]>
--- 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
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP: Fix merge errors in board-overo.c
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/