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>

SVN-Revision: 41115
This commit is contained in:
Steven Barth 2014-06-11 12:19:44 +00:00
parent e50f3b4fc7
commit ba59fab9bb

View file

@ -1358,7 +1358,7 @@ $(eval $(call KernelPackage,usbip-server))
define KernelPackage/usb-chipidea define KernelPackage/usb-chipidea
TITLE:=Support for ChipIdea controllers TITLE:=Support for ChipIdea controllers
DEPENDS:=+kmod-usb2 DEPENDS:=+kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget
KCONFIG:=\ KCONFIG:=\
CONFIG_USB_CHIPIDEA \ CONFIG_USB_CHIPIDEA \
CONFIG_USB_CHIPIDEA_HOST=y \ CONFIG_USB_CHIPIDEA_HOST=y \
@ -1373,7 +1373,6 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1)
else else
FILES:=\ FILES:=\
$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ $(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/ci_hdrc_imx.ko) \
$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_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) AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1)