domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix dependencies for x86 target

Browse Source 
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

SVN-Revision: 20590
This commit is contained in:
Hauke Mehrtens
2010-03-29 21:02:14 +00:00
parent 809ac20df2
commit 23c3cdcd66
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/modules/usb.mk
View File

@@ -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