diff options
| author | John Crispin <john@openwrt.org> | 2014-06-03 05:49:34 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-03 05:49:34 +0000 |
| commit | 6fe4cc42d23745952cd481c5d8b2d0392b800a5e (patch) | |
| tree | 838ccee3e30a1ddeb35d0860d9efeffb7fa77deb /package/kernel/linux | |
| parent | cdd9e952e53781056f32da1a9222cfe51af9651d (diff) | |
| download | upstream-6fe4cc42d23745952cd481c5d8b2d0392b800a5e.tar.gz upstream-6fe4cc42d23745952cd481c5d8b2d0392b800a5e.tar.bz2 upstream-6fe4cc42d23745952cd481c5d8b2d0392b800a5e.zip | |
kernel: fix kernel build for chipidea w/o usb-gadget
This resolves a module dependency kernel regression in r40905 with the
usb-chipidea module if usb-gadget was not selected.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 40992
Diffstat (limited to 'package/kernel/linux')
| -rw-r--r-- | package/kernel/linux/modules/usb.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 10b89da715..1fd4ddc427 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1373,10 +1373,10 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1) else FILES:=\ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ - $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/gadget/udc-core.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_imxudc-core),1) + AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1) endif $(call AddDepends/usb) endef |