From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2011 02:05:40 +0000 (-0700)
Subject: Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=63a93699c6a58795b854ff573542a08367684dae;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'remove' of /home/rmk/linux-2.6-arm

* 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6629/2: aaec2000: remove support for mach-aaec2000
  ARM: lh7a40x: remove unmaintained platform support

Fix up trivial conflicts in
 - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
 - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
---

63a93699c6a58795b854ff573542a08367684dae
diff --cc drivers/usb/gadget/Kconfig
index bfde50e20b30,08a48ae23745..bc5123cf41c2
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -176,30 -176,6 +176,18 @@@ config USB_FSL_USB
  	default USB_GADGET
  	select USB_GADGET_SELECTED
  
 +config USB_GADGET_FUSB300
 +	boolean "Faraday FUSB300 USB Peripheral Controller"
 +	select USB_GADGET_DUALSPEED
 +	help
 +	   Faraday usb device controller FUSB300 driver
 +
 +config USB_FUSB300
 +	tristate
 +	depends on USB_GADGET_FUSB300
 +	default USB_GADGET
 +	select USB_GADGET_SELECTED
 +
- config USB_GADGET_LH7A40X
- 	boolean "LH7A40X"
- 	depends on ARCH_LH7A40X
- 	help
- 	   This driver provides USB Device Controller driver for LH7A40x
- 
- config USB_LH7A40X
- 	tristate
- 	depends on USB_GADGET_LH7A40X
- 	default USB_GADGET
- 	select USB_GADGET_SELECTED
- 
  config USB_GADGET_OMAP
  	boolean "OMAP USB Device Controller"
  	depends on ARCH_OMAP