aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-17 15:28:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-17 15:28:17 +0000
commit95757184a0b76adafb500cc62fd7ba6e3c8195de (patch)
treec64b663cbff1d6778483195dd36bf98fcba0d5a4
parentbf2796c5993c9539f5d91c53469142c4a58c21ca (diff)
downloadupstream-95757184a0b76adafb500cc62fd7ba6e3c8195de.tar.gz
upstream-95757184a0b76adafb500cc62fd7ba6e3c8195de.tar.bz2
upstream-95757184a0b76adafb500cc62fd7ba6e3c8195de.zip
kernel: remove obsolete dependencies and conditionals
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31779 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/crypto.mk2
-rw-r--r--package/kernel/modules/fs.mk8
-rw-r--r--package/kernel/modules/lib.mk4
-rw-r--r--package/kernel/modules/other.mk4
-rw-r--r--package/kernel/modules/usb.mk3
-rw-r--r--package/kernel/modules/video.mk5
6 files changed, 12 insertions, 14 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 3c1528e984..bb612fcf6c 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -64,7 +64,7 @@ $(eval $(call KernelPackage,crypto-manager))
define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface
- DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @!LINUX_2_6_37
+ DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
KCONFIG:= \
CONFIG_CRYPTO_USER_API \
CONFIG_CRYPTO_USER_API_HASH \
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index cd6db90ef6..9226ad9031 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -25,7 +25,7 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
- DEPENDS:=+kmod-lib-crc32c +!(LINUX_2_6_37):kmod-lib-lzo +kmod-lib-zlib
+ DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib
KCONFIG:=\
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \
@@ -56,9 +56,9 @@ define KernelPackage/fs-cifs
+kmod-crypto-arc4 \
+kmod-crypto-hmac \
+kmod-crypto-md5 \
- +!(LINUX_2_6_37):kmod-crypto-md4 \
- +!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39):kmod-crypto-des \
- +!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39):kmod-crypto-ecb
+ +kmod-crypto-md4 \
+ +kmod-crypto-des \
+ +kmod-crypto-ecb
endef
define KernelPackage/fs-cifs/description
diff --git a/package/kernel/modules/lib.mk b/package/kernel/modules/lib.mk
index cf21d49fdb..6029f79302 100644
--- a/package/kernel/modules/lib.mk
+++ b/package/kernel/modules/lib.mk
@@ -55,7 +55,7 @@ $(eval $(call KernelPackage,lib-crc7))
define KernelPackage/lib-crc8
SUBMENU:=$(LIB_MENU)
TITLE:=CRC8 support
- DEPENDS:= @!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0)
+ DEPENDS:= @!LINUX_2_6_39
KCONFIG:=CONFIG_CRC8
FILES:=$(LINUX_DIR)/lib/crc8.ko
AUTOLOAD:=$(call AutoLoad,20,crc8)
@@ -150,7 +150,7 @@ $(eval $(call KernelPackage,lib-zlib))
define KernelPackage/lib-cordic
SUBMENU:=$(LIB_MENU)
TITLE:=Cordic function support
- DEPENDS:= @!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0)
+ DEPENDS:= @!LINUX_2_6_39
KCONFIG:=CONFIG_CORDIC
FILES:=$(LINUX_DIR)/lib/cordic.ko
AUTOLOAD:=$(call AutoLoad,20,cordic)
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index ea0e91ffee..be762533f6 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -825,7 +825,7 @@ $(eval $(call KernelPackage,mtdtests))
define KernelPackage/nand
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND flash support
- DEPENDS:=@!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39)
+ DEPENDS:=@!LINUX_2_6_39
KCONFIG:=CONFIG_MTD_NAND \
CONFIG_MTD_NAND_IDS \
CONFIG_MTD_NAND_ECC
@@ -846,7 +846,7 @@ $(eval $(call KernelPackage,nand))
define KernelPackage/nandsim
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND simulator
- DEPENDS:=@!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39) +kmod-nand
+ DEPENDS:=+kmod-nand
KCONFIG:=CONFIG_MTD_NAND_NANDSIM
FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko
endef
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 7f27a20aec..893d7b2a3f 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -561,7 +561,6 @@ $(eval $(call KernelPackage,usb-serial-keyspan))
define KernelPackage/usb-serial-wwan
TITLE:=Support for GSM and CDMA modems
- DEPENDS:= @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32
KCONFIG:=CONFIG_USB_SERIAL_WWAN
FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
@@ -577,7 +576,7 @@ $(eval $(call KernelPackage,usb-serial-wwan))
define KernelPackage/usb-serial-option
TITLE:=Support for Option HSDPA modems
- DEPENDS:=+!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32:kmod-usb-serial-wwan
+ DEPENDS:=+kmod-usb-serial-wwan
KCONFIG:=CONFIG_USB_SERIAL_OPTION
FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
AUTOLOAD:=$(call AutoLoad,65,option)
diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
index 5ff55c9014..d5063e8250 100644
--- a/package/kernel/modules/video.mk
+++ b/package/kernel/modules/video.mk
@@ -43,7 +43,6 @@ endef
define KernelPackage/video-videobuf2
TITLE:=videobuf2 lib
- DEPENDS:= @!(LINUX_2_6_37||LINUX_2_6_38)
KCONFIG:= \
CONFIG_VIDEOBUF2_CORE \
CONFIG_VIDEOBUF2_MEMOPS \
@@ -99,7 +98,7 @@ $(eval $(call KernelPackage,video-sn9c102))
define KernelPackage/video-pwc
TITLE:=Philips USB webcam support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0):kmod-video-videobuf2
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!LINUX_2_6_39:kmod-video-videobuf2
KCONFIG:= \
CONFIG_USB_PWC \
CONFIG_USB_PWC_DEBUG=n
@@ -117,7 +116,7 @@ $(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0||LINUX_3_1||LINUX_3_2):kmod-video-videobuf2
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_39||LINUX_3_1||LINUX_3_2):kmod-video-videobuf2
KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo)