From f0a411ebcfcb761680eaa89dae7e529b3b702dea Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 29 Mar 2010 21:02:14 +0000 Subject: kernel: fix dependencies for x86 target kmod-hid and kmod-input-core are directly build into the kernel for the x86 target. No package on x86 should depend on it. This fixes #6963 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20590 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/kernel/modules/usb.mk') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 322c62398a..c962e340ed 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -777,7 +777,7 @@ $(eval $(call KernelPackage,usb-net-rndis)) define KernelPackage/usb-hid -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-hid) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev +!TARGET_x86:kmod-hid) TITLE:=Support for USB Human Input Devices KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko @@ -793,7 +793,7 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev) TITLE:=USB Yealink VOIP phone KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko @@ -808,7 +808,7 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev) TITLE:=Support for CM109 device KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko -- cgit v1.2.3