aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/modules/other.mk
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-24 11:01:06 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-24 11:01:06 +0000
commit6c2527497e0eddc8a2968952ed605a7a21d3c00c (patch)
tree879ce44ba1712fb0937e9ca2e98f9d81fceed22f /package/kernel/modules/other.mk
parent2aef7ab49143cd0f4d2a7e9abf08e636f4c1bfec (diff)
downloadupstream-6c2527497e0eddc8a2968952ed605a7a21d3c00c.tar.gz
upstream-6c2527497e0eddc8a2968952ed605a7a21d3c00c.tar.bz2
upstream-6c2527497e0eddc8a2968952ed605a7a21d3c00c.zip
package/kernel: use macros for hid & input
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21120 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/other.mk')
-rw-r--r--package/kernel/modules/other.mk20
1 files changed, 13 insertions, 7 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index aaa7bf008e..fbaf7638da 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -262,7 +262,7 @@ $(eval $(call KernelPackage,ssb))
define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
@@ -282,6 +282,7 @@ define KernelPackage/bluetooth
CONFIG_BT_HCIUART \
CONFIG_BT_HIDP
$(call AddDepends/crc16)
+ $(call AddDepends/hid)
$(call AddDepends/rfkill)
endef
@@ -654,10 +655,11 @@ $(eval $(call KernelPackage,sc520-wdt))
define KernelPackage/input-core
SUBMENU:=$(OTHER_MENU)
TITLE:=Input device core
- DEPENDS:=@LINUX_2_6 @!TARGET_x86
+ DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_INPUT
FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,19,input-core)
+ $(call SetDepends/input)
endef
define KernelPackage/input-core/description
@@ -670,10 +672,10 @@ $(eval $(call KernelPackage,input-core))
define KernelPackage/input-evdev
SUBMENU:=$(OTHER_MENU)
TITLE:=Input event device
- DEPENDS:=+!TARGET_x86:kmod-input-core
KCONFIG:=CONFIG_INPUT_EVDEV
FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,evdev)
+ $(call AddDepends/input)
endef
define KernelPackage/input-evdev/description
@@ -686,10 +688,12 @@ $(eval $(call KernelPackage,input-evdev))
define KernelPackage/hid
SUBMENU:=$(OTHER_MENU)
TITLE:=HID Devices
- DEPENDS:=+kmod-input-core +kmod-input-evdev @!TARGET_x86
+ DEPENDS:=+kmod-input-evdev
KCONFIG:=CONFIG_HID
FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,61,hid)
+ $(call SetDepends/hid)
+ $(call AddDepends/input)
endef
define KernelPackage/hid/description
@@ -702,10 +706,11 @@ $(eval $(call KernelPackage,hid))
define KernelPackage/input-polldev
SUBMENU:=$(OTHER_MENU)
TITLE:=Polled Input device support
- DEPENDS:=+!TARGET_x86:kmod-input-core @LINUX_2_6
+ DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_INPUT_POLLDEV
FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,input-polldev)
+ $(call AddDepends/input)
endef
define KernelPackage/input-polldev/description
@@ -718,10 +723,11 @@ $(eval $(call KernelPackage,input-polldev))
define KernelPackage/input-gpio-keys
SUBMENU:=$(OTHER_MENU)
TITLE:=GPIO key support
- DEPENDS:= @GPIO_SUPPORT +!TARGET_x86:kmod-input-core
+ DEPENDS:= @GPIO_SUPPORT
KCONFIG:=CONFIG_KEYBOARD_GPIO
FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,gpio_keys)
+ $(call AddDepends/input)
endef
define KernelPackage/input-gpio-keys/description
@@ -752,10 +758,10 @@ $(eval $(call KernelPackage,input-gpio-buttons))
define KernelPackage/input-joydev
SUBMENU:=$(OTHER_MENU)
TITLE:=Joystick device support
- DEPENDS:=+!TARGET_x86:kmod-input-core
KCONFIG:=CONFIG_INPUT_JOYDEV
FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,62,joydev)
+ $(call AddDepends/input)
endef
define KernelPackage/input-joydev/description