Browse Source

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 <[email protected]>

SVN-Revision: 40992
John Crispin 11 years ago
parent
commit
6fe4cc42d2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      package/kernel/linux/modules/usb.mk

+ 2 - 2
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