fixup merge mistakes in l-o master
Subsystems (3)
cover fixup merge mistakes in l-o master
Here's a couple patches to undo some merge mistakes and fixup l-o master so patches apply to l-o master and upstream.
Kevin Hilman (2):
OMAP3: Kconfig: remove duplicate board entries
OMAP3: omap3evm: undo ehci change to board-omap3evm.c
arch/arm/mach-omap2/Kconfig | 12 ------------ arch/arm/mach-omap2/board-omap3evm.c | 1 - 2 files changed, 0 insertions(+), 13 deletions(-)
PATCH 1/2 OMAP3: Kconfig: remove duplicate board entries
Remove some duplicate board entries created from a merge.
--- arch/arm/mach-omap2/Kconfig | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-)
arch/arm/mach-omap2/Kconfig +0 -12
@@ -133,22 +133,10 @@ config MACH_OVERO bool "Gumstix Overo board" depends on ARCH_OMAP3 && ARCH_OMAP34XX -config MACH_OMAP3EVM - bool "OMAP 3530 EVM board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX - config MACH_OMAP3_PANDORA bool "OMAP3 Pandora" depends on ARCH_OMAP3 && ARCH_OMAP34XX -config MACH_OMAP_3430SDP - bool "OMAP 3430 SDP board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX - -config MACH_OMAP_ZOOM2 - bool "OMAP3 Zoom2 board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX - config MACH_OMAP_ZOOM2 bool "OMAP3 Zoom2 board" depends on ARCH_OMAP3 && ARCH_OMAP34XX
Signature · 1 line
1.6.3.2
PATCH 2/2 OMAP3: omap3evm: undo ehci change to board-omap3evm.c
Call to omap3evm_flash_init() mistakenly added by EHCI patch.
--- arch/arm/mach-omap2/board-omap3evm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +0 -1
@@ -309,7 +309,6 @@ static void __init omap3_evm_init(void)omap_serial_init ();usb_musb_init ();usb_ehci_init (EHCI_HCD_OMAP_MODE_PHY , true, true,57 ,61 ); -omap3evm_flash_init ();ads7846_dev_init (); }
Signature · 1 line
1.6.3.2
Tony Lindgren
maintainerPATCH 2/2 OMAP3: omap3evm: undo ehci change to board-omap3evm.c
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: master
Initial commit ID (Likely to change): 947478830b2046913ef6cbe64243a4c6530ff835
PatchWorks
http://patchwork.kernel.org/patch/32468/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=947478830b2046913ef6cbe64243a4c6530ff835
Tony Lindgren
maintainerPATCH 1/2 OMAP3: Kconfig: remove duplicate board entries
In reply to Kevin HilmanThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: master
Initial commit ID (Likely to change): 5234fb35f6b3313805d5d1014456b50159935edc
PatchWorks
http://patchwork.kernel.org/patch/32467/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5234fb35f6b3313805d5d1014456b50159935edc