From: Greg Kroah-Hartman Date: Tue, 11 Sep 2012 20:39:31 +0000 (-0700) Subject: Merge tag 'gadget-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7135f08e47de094f8748507806efa8d7ba27a964;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'gadget-for-v3.7' of git://git./linux/kernel/git/balbi/usb into usb-next usb: gadget: patches for v3.7 merge window This pull request is large but the biggest part is the first part of the cleanup on the gadget framework so we have a saner setup to add configfs support for v3.8. We have also some more conversions to the new udc_start/udc_stop which makes us closer from dropping the old interfaces. USB_GADGET_DUALSPEED and USB_GADGET_SUPERSPEED are finally gone, thanks to Michal for his awesome work. Other than that, we have the usual set of miscellaneous changes and cleanups involving improvements to debug messages, removal of duplicated includes, moving dereference after NULL test, making renesas_hsbhs' irq handler Shared, unused code being dropped, prevention of sleep-inside-spinlock bugs and a race condition fix on udc-core. --- 7135f08e47de094f8748507806efa8d7ba27a964 diff --cc drivers/usb/chipidea/Kconfig index 47e499c9c0b6,272109ff5aa3..1ea932a13685 --- a/drivers/usb/chipidea/Kconfig +++ b/drivers/usb/chipidea/Kconfig @@@ -12,8 -12,7 +12,7 @@@ if USB_CHIPIDE config USB_CHIPIDEA_UDC bool "ChipIdea device controller" - depends on USB_GADGET + depends on USB_GADGET=y || USB_GADGET=USB_CHIPIDEA - select USB_GADGET_DUALSPEED help Say Y here to enable device controller functionality of the ChipIdea driver.