From 13e7b6d77da41b47ccd7947d208b3d4eaea29b81 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 29 Mar 2015 08:12:39 +0000 Subject: [PATCH] kernel: remove useless AddDepends/input abstraction Signed-off-by: Felix Fietkau SVN-Revision: 45135 --- package/kernel/linux/modules/001-depends.mk | 5 ----- package/kernel/linux/modules/input.mk | 16 +++++++--------- package/kernel/linux/modules/other.mk | 2 +- package/kernel/linux/modules/sound.mk | 6 ++---- package/kernel/linux/modules/usb.mk | 7 +++---- package/kernel/linux/modules/video.mk | 3 +-- 6 files changed, 14 insertions(+), 25 deletions(-) diff --git a/package/kernel/linux/modules/001-depends.mk b/package/kernel/linux/modules/001-depends.mk index 57fc9abf73..81192e0547 100644 --- a/package/kernel/linux/modules/001-depends.mk +++ b/package/kernel/linux/modules/001-depends.mk @@ -5,11 +5,6 @@ # See /LICENSE for more information. # -define AddDepends/input - DEPENDS+= +kmod-input-core $(1) -endef - - define AddDepends/nls DEPENDS+= +kmod-nls-base $(foreach cp,$(1),+kmod-nls-$(cp)) endef diff --git a/package/kernel/linux/modules/input.mk b/package/kernel/linux/modules/input.mk index 1e8b2f0257..6c9f228497 100644 --- a/package/kernel/linux/modules/input.mk +++ b/package/kernel/linux/modules/input.mk @@ -10,10 +10,10 @@ INPUT_MODULES_MENU:=Input modules define KernelPackage/hid SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=HID Devices + DEPENDS:=+kmod-input-core +kmod-input-evdev KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y FILES:=$(LINUX_DIR)/drivers/hid/hid.ko AUTOLOAD:=$(call AutoLoad,61,hid) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/hid/description @@ -54,10 +54,10 @@ $(eval $(call KernelPackage,input-core)) define KernelPackage/input-evdev SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Input event device + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_EVDEV FILES:=$(LINUX_DIR)/drivers/input/evdev.ko AUTOLOAD:=$(call AutoLoad,60,evdev) - $(call AddDepends/input) endef define KernelPackage/input-evdev/description @@ -70,13 +70,12 @@ $(eval $(call KernelPackage,input-evdev)) define KernelPackage/input-gpio-keys SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=GPIO key support - DEPENDS:= @GPIO_SUPPORT + DEPENDS:= @GPIO_SUPPORT +kmod-input-core KCONFIG:= \ CONFIG_KEYBOARD_GPIO \ CONFIG_INPUT_KEYBOARD=y FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko AUTOLOAD:=$(call AutoProbe,gpio_keys) - $(call AddDepends/input) endef define KernelPackage/input-gpio-keys/description @@ -99,7 +98,6 @@ define KernelPackage/input-gpio-keys-polled CONFIG_INPUT_KEYBOARD=y FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys_polled.ko AUTOLOAD:=$(call AutoProbe,gpio_keys_polled,1) - $(call AddDepends/input) endef define KernelPackage/input-gpio-keys-polled/description @@ -115,10 +113,10 @@ $(eval $(call KernelPackage,input-gpio-keys-polled)) define KernelPackage/input-gpio-encoder SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=GPIO rotay encoder + DEPENDS:=@GPIO_SUPPORT +kmod-input-core KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko AUTOLOAD:=$(call AutoProbe,rotary_encoder) - $(call AddDepends/input,@GPIO_SUPPORT) endef define KernelPackage/gpio-encoder/description @@ -131,10 +129,10 @@ $(eval $(call KernelPackage,input-gpio-encoder)) define KernelPackage/input-joydev SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Joystick device support + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_JOYDEV FILES:=$(LINUX_DIR)/drivers/input/joydev.ko AUTOLOAD:=$(call AutoProbe,joydev) - $(call AddDepends/input) endef define KernelPackage/input-joydev/description @@ -147,9 +145,9 @@ $(eval $(call KernelPackage,input-joydev)) define KernelPackage/input-polldev SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Polled Input device support + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_POLLDEV FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko - $(call AddDepends/input) endef define KernelPackage/input-polldev/description @@ -162,10 +160,10 @@ $(eval $(call KernelPackage,input-polldev)) define KernelPackage/input-matrixkmap SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Input matrix devices support + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_MATRIXKMAP FILES:=$(LINUX_DIR)/drivers/input/matrix-keymap.ko AUTOLOAD:=$(call AutoProbe,matrix-keymap) - $(call AddDepends/input) endef define KernelPackage/input-matrix/description diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index c270481932..97990b70bc 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -952,13 +952,13 @@ $(eval $(call KernelPackage,thermal-kirkwood)) define KernelPackage/gpio-beeper SUBMENU:=$(OTHER_MENU) TITLE:=GPIO beeper support + DEPENDS:=+kmod-input-core KCONFIG:= \ CONFIG_INPUT_MISC=y \ CONFIG_INPUT_GPIO_BEEPER FILES:= \ $(LINUX_DIR)/drivers/input/misc/gpio-beeper.ko AUTOLOAD:=$(call AutoLoad,50,gpio-beeper) - $(call AddDepends/input) endef define KernelPackage/gpio-beeper/description diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 9a3caed32a..54bc30ac32 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -51,7 +51,7 @@ endif define KernelPackage/sound-core SUBMENU:=$(SOUND_MENU) TITLE:=Sound support - DEPENDS:=@AUDIO_SUPPORT + DEPENDS:=@AUDIO_SUPPORT +kmod-input-core KCONFIG:= \ CONFIG_SOUND \ CONFIG_SND \ @@ -70,7 +70,6 @@ define KernelPackage/sound-core CONFIG_SND_COMPRESS_OFFLOAD FILES:=$(SOUNDCORE_FILES) AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD)) - $(call AddDepends/input) endef define KernelPackage/sound-core/uml @@ -233,7 +232,7 @@ $(eval $(call KernelPackage,sound-soc-gw_avila)) define KernelPackage/pcspkr - DEPENDS:=@TARGET_x86 + DEPENDS:=@TARGET_x86 +kmod-input-core TITLE:=PC speaker support KCONFIG:= \ CONFIG_INPUT_PCSPKR \ @@ -242,7 +241,6 @@ define KernelPackage/pcspkr $(LINUX_DIR)/drivers/input/misc/pcspkr.ko \ $(LINUX_DIR)/sound/drivers/pcsp/snd-pcsp.ko AUTOLOAD:=$(call AutoLoad,50,pcspkr snd-pcsp) - $(call AddDepends/input) $(call AddDepends/sound) endef diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index ef803f3eb3..b57ca9209f 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1311,11 +1311,10 @@ $(eval $(call KernelPackage,usb-net-kalmia)) 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 + DEPENDS:=+kmod-hid +kmod-hid-generic +kmod-input-evdev FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoProbe,usbhid) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-hid/description @@ -1327,11 +1326,11 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink TITLE:=USB Yealink VOIP phone + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko AUTOLOAD:=$(call AutoProbe,yealink) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-yealink/description @@ -1343,11 +1342,11 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 TITLE:=Support for CM109 device + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko AUTOLOAD:=$(call AutoProbe,cm109) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-cm109/description diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 25ef9cb7dc..7a7d80c534 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -184,12 +184,11 @@ $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc TITLE:=USB Video Class (UVC) support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 +kmod-input-core KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko AUTOLOAD:=$(call AutoProbe,uvcvideo) $(call AddDepends/camera) - $(call AddDepends/input) endef define KernelPackage/video-uvc/description -- 2.25.1