From 656f01c50f32b1255cebfcf7ea2e7b46ae128444 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 11 Jun 2014 12:19:44 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41115 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/linux/modules/usb.mk | 3 +-- 1 file changed, 1 insertion(+), 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)