aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-06-11 12:19:44 +0000
committerSteven Barth <steven@midlink.org>2014-06-11 12:19:44 +0000
commit656f01c50f32b1255cebfcf7ea2e7b46ae128444 (patch)
treeec8cdae56db593ed2e7febc7a455b45812213a26
parenta1912788a80a8fce227050df35273c7eb93cdec6 (diff)
downloadmaster-187ad058-656f01c50f32b1255cebfcf7ea2e7b46ae128444.tar.gz
master-187ad058-656f01c50f32b1255cebfcf7ea2e7b46ae128444.tar.bz2
master-187ad058-656f01c50f32b1255cebfcf7ea2e7b46ae128444.zip
kernel: fix kernel builds for chipidea w/ usb-gadget
Instead of repackaging udc-core.ko again, just add a dependency to kmod-usb-gadget, which already contains it. Fixes kmod-chipidea builds for 3.10- with usb-gadget enabled. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41115 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/linux/modules/usb.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 1fd4ddc427..47e337284a 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1358,7 +1358,7 @@ $(eval $(call KernelPackage,usbip-server))
define KernelPackage/usb-chipidea
TITLE:=Support for ChipIdea controllers
- DEPENDS:=+kmod-usb2
+ DEPENDS:=+kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget
KCONFIG:=\
CONFIG_USB_CHIPIDEA \
CONFIG_USB_CHIPIDEA_HOST=y \
@@ -1373,7 +1373,6 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1)
else
FILES:=\
$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
- $(if $(CONFIG_USB_GADGET),$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko) \
$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \
$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko)
AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1)