aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-29 08:12:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-29 08:12:23 +0000
commit4b86893200de6f1aa9d76578de43c8aa9f5de132 (patch)
tree451d3633f3f234d251d93f861e6a4bda8e005897
parentbdf3aed1173c631822eed37b28ea240c6017c6b4 (diff)
downloadupstream-4b86893200de6f1aa9d76578de43c8aa9f5de132.tar.gz
upstream-4b86893200de6f1aa9d76578de43c8aa9f5de132.tar.bz2
upstream-4b86893200de6f1aa9d76578de43c8aa9f5de132.zip
kernel: remove useless AddDepends/crc16 abstraction
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45133 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/linux/modules/001-depends.mk4
-rw-r--r--package/kernel/linux/modules/fs.mk4
-rw-r--r--package/kernel/linux/modules/netsupport.mk2
-rw-r--r--package/kernel/linux/modules/other.mk3
4 files changed, 5 insertions, 8 deletions
diff --git a/package/kernel/linux/modules/001-depends.mk b/package/kernel/linux/modules/001-depends.mk
index d0ad083662..e845670ec8 100644
--- a/package/kernel/linux/modules/001-depends.mk
+++ b/package/kernel/linux/modules/001-depends.mk
@@ -5,10 +5,6 @@
# See /LICENSE for more information.
#
-define AddDepends/crc16
- DEPENDS+= +kmod-lib-crc16 $(1)
-endef
-
define AddDepends/hid
DEPENDS+= +kmod-hid $(1)
endef
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 64182e680d..94d4cf2a53 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -155,6 +155,9 @@ $(eval $(call KernelPackage,fs-exportfs))
define KernelPackage/fs-ext4
SUBMENU:=$(FS_MENU)
TITLE:=EXT4 filesystem support
+ DEPENDS := \
+ +kmod-lib-crc16 \
+ +kmod-crypto-hash
KCONFIG:= \
CONFIG_EXT4_FS \
CONFIG_JBD2
@@ -163,7 +166,6 @@ define KernelPackage/fs-ext4
$(LINUX_DIR)/fs/jbd2/jbd2.ko \
$(LINUX_DIR)/fs/mbcache.ko
AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
- $(call AddDepends/crc16, +kmod-crypto-hash)
endef
define KernelPackage/fs-ext4/description
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 4ac23c660c..0d70a88a05 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -825,6 +825,7 @@ $(eval $(call KernelPackage,sched))
define KernelPackage/ax25
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=AX25 support
+ DEPENDS:=+kmod-lib-crc16
KCONFIG:= \
CONFIG_HAMRADIO=y \
CONFIG_AX25 \
@@ -833,7 +834,6 @@ define KernelPackage/ax25
$(LINUX_DIR)/net/ax25/ax25.ko \
$(LINUX_DIR)/drivers/net/hamradio/mkiss.ko
AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
- $(call AddDepends/crc16)
endef
define KernelPackage/ax25/description
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 86770b5a3b..1644f77ce4 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,6lowpan-iphc))
define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +!LINUX_3_10:kmod-6lowpan-iphc
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +!LINUX_3_10:kmod-6lowpan-iphc +kmod-lib-crc16
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
@@ -50,7 +50,6 @@ define KernelPackage/bluetooth
CONFIG_BT_HCIUART_H4 \
CONFIG_BT_HIDP \
CONFIG_HID_SUPPORT=y
- $(call AddDepends/crc16)
$(call AddDepends/hid)
$(call AddDepends/rfkill)
FILES:= \