Author: nbd
Date: 2015-03-29 10:12:31 +0200 (Sun, 29 Mar 2015)
New Revision: 45134

Modified:
   trunk/package/kernel/linux/modules/001-depends.mk
   trunk/package/kernel/linux/modules/input.mk
   trunk/package/kernel/linux/modules/other.mk
   trunk/package/kernel/linux/modules/usb.mk
Log:
kernel: remove useless AddDepends/hid abstraction

Signed-off-by: Felix Fietkau <[email protected]>

Modified: trunk/package/kernel/linux/modules/001-depends.mk
===================================================================
--- trunk/package/kernel/linux/modules/001-depends.mk   2015-03-29 08:12:23 UTC 
(rev 45133)
+++ trunk/package/kernel/linux/modules/001-depends.mk   2015-03-29 08:12:31 UTC 
(rev 45134)
@@ -5,10 +5,6 @@
 # See /LICENSE for more information.
 #
 
-define AddDepends/hid
-  DEPENDS+= +kmod-hid $(1)
-endef
-
 define AddDepends/input
   DEPENDS+= +kmod-input-core $(1)
 endef

Modified: trunk/package/kernel/linux/modules/input.mk
===================================================================
--- trunk/package/kernel/linux/modules/input.mk 2015-03-29 08:12:23 UTC (rev 
45133)
+++ trunk/package/kernel/linux/modules/input.mk 2015-03-29 08:12:31 UTC (rev 
45134)
@@ -25,10 +25,10 @@
 define KernelPackage/hid-generic
   SUBMENU:=$(INPUT_MODULES_MENU)
   TITLE:=Generic HID device support
+  DEPENDS:=+kmod-hid
   KCONFIG:=CONFIG_HID_GENERIC
   FILES:=$(LINUX_DIR)/drivers/hid/hid-generic.ko
   AUTOLOAD:=$(call AutoProbe,hid-generic)
-  $(call AddDepends/hid)
 endef
 
 define KernelPackage/hid/description

Modified: trunk/package/kernel/linux/modules/other.mk
===================================================================
--- trunk/package/kernel/linux/modules/other.mk 2015-03-29 08:12:23 UTC (rev 
45133)
+++ trunk/package/kernel/linux/modules/other.mk 2015-03-29 08:12:31 UTC (rev 
45134)
@@ -29,7 +29,7 @@
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash 
+!LINUX_3_10:kmod-6lowpan-iphc +kmod-lib-crc16
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash 
+!LINUX_3_10:kmod-6lowpan-iphc +kmod-lib-crc16 +kmod-hid
   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \
@@ -50,7 +50,6 @@
        CONFIG_BT_HCIUART_H4 \
        CONFIG_BT_HIDP \
        CONFIG_HID_SUPPORT=y
-  $(call AddDepends/hid)
   $(call AddDepends/rfkill)
   FILES:= \
        $(LINUX_DIR)/net/bluetooth/bluetooth.ko \

Modified: trunk/package/kernel/linux/modules/usb.mk
===================================================================
--- trunk/package/kernel/linux/modules/usb.mk   2015-03-29 08:12:23 UTC (rev 
45133)
+++ trunk/package/kernel/linux/modules/usb.mk   2015-03-29 08:12:31 UTC (rev 
45134)
@@ -1311,10 +1311,10 @@
 define KernelPackage/usb-hid
   TITLE:=Support for USB Human Input Devices
   KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID CONFIG_USB_HIDDEV=y
+  DEPENDS:=+kmod-hid +kmod-hid-generic
   FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
   AUTOLOAD:=$(call AutoProbe,usbhid)
   $(call AddDepends/usb)
-  $(call AddDepends/hid,+kmod-hid-generic)
   $(call AddDepends/input,+kmod-input-evdev)
 endef
 
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to