qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-20 00:09:43 +02:00
Code

kernel: remove obsolete dependencies and conditionals

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31779 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-05-17 15:28:17 +00:00
parent 1a4d57d959
commit 8cf054b884
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/modules/crypto.mk
View File

@ -64,7 +64,7 @@ $(eval $(call KernelPackage,crypto-manager))
define KernelPackage/crypto-user define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface TITLE:=CryptoAPI userspace interface
DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @!LINUX_2_6_37 DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_USER_API \ CONFIG_CRYPTO_USER_API \
CONFIG_CRYPTO_USER_API_HASH \ CONFIG_CRYPTO_USER_API_HASH \

8
package/kernel/modules/fs.mk
View File

@ -25,7 +25,7 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support 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:=\ KCONFIG:=\
CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \ CONFIG_BTRFS_FS_POSIX_ACL=n \
@ -56,9 +56,9 @@ define KernelPackage/fs-cifs
+kmod-crypto-arc4 \ +kmod-crypto-arc4 \
+kmod-crypto-hmac \ +kmod-crypto-hmac \
+kmod-crypto-md5 \ +kmod-crypto-md5 \
+!(LINUX_2_6_37):kmod-crypto-md4 \ +kmod-crypto-md4 \
+!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39):kmod-crypto-des \ +kmod-crypto-des \
+!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39):kmod-crypto-ecb +kmod-crypto-ecb
endef endef
define KernelPackage/fs-cifs/description define KernelPackage/fs-cifs/description

4
package/kernel/modules/lib.mk
View File

@ -55,7 +55,7 @@ $(eval $(call KernelPackage,lib-crc7))
define KernelPackage/lib-crc8 define KernelPackage/lib-crc8
SUBMENU:=$(LIB_MENU) SUBMENU:=$(LIB_MENU)
TITLE:=CRC8 support 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 KCONFIG:=CONFIG_CRC8
FILES:=$(LINUX_DIR)/lib/crc8.ko FILES:=$(LINUX_DIR)/lib/crc8.ko
AUTOLOAD:=$(call AutoLoad,20,crc8) AUTOLOAD:=$(call AutoLoad,20,crc8)
@ -150,7 +150,7 @@ $(eval $(call KernelPackage,lib-zlib))
define KernelPackage/lib-cordic define KernelPackage/lib-cordic
SUBMENU:=$(LIB_MENU) SUBMENU:=$(LIB_MENU)
TITLE:=Cordic function support 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 KCONFIG:=CONFIG_CORDIC
FILES:=$(LINUX_DIR)/lib/cordic.ko FILES:=$(LINUX_DIR)/lib/cordic.ko
AUTOLOAD:=$(call AutoLoad,20,cordic) AUTOLOAD:=$(call AutoLoad,20,cordic)

4
package/kernel/modules/other.mk
View File

@ -825,7 +825,7 @@ $(eval $(call KernelPackage,mtdtests))
define KernelPackage/nand define KernelPackage/nand
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=NAND flash support 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 \ KCONFIG:=CONFIG_MTD_NAND \
CONFIG_MTD_NAND_IDS \ CONFIG_MTD_NAND_IDS \
CONFIG_MTD_NAND_ECC CONFIG_MTD_NAND_ECC
@ -846,7 +846,7 @@ $(eval $(call KernelPackage,nand))
define KernelPackage/nandsim define KernelPackage/nandsim
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=NAND simulator 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 KCONFIG:=CONFIG_MTD_NAND_NANDSIM
FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko
endef endef

3
package/kernel/modules/usb.mk
View File

@ -561,7 +561,6 @@ $(eval $(call KernelPackage,usb-serial-keyspan))
define KernelPackage/usb-serial-wwan define KernelPackage/usb-serial-wwan
TITLE:=Support for GSM and CDMA modems 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 KCONFIG:=CONFIG_USB_SERIAL_WWAN
FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
AUTOLOAD:=$(call AutoLoad,61,usb_wwan) AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
@ -577,7 +576,7 @@ $(eval $(call KernelPackage,usb-serial-wwan))
define KernelPackage/usb-serial-option define KernelPackage/usb-serial-option
TITLE:=Support for Option HSDPA modems 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 KCONFIG:=CONFIG_USB_SERIAL_OPTION
FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
AUTOLOAD:=$(call AutoLoad,65,option) AUTOLOAD:=$(call AutoLoad,65,option)

5
package/kernel/modules/video.mk
View File

@ -43,7 +43,6 @@ endef
define KernelPackage/video-videobuf2 define KernelPackage/video-videobuf2
TITLE:=videobuf2 lib TITLE:=videobuf2 lib
DEPENDS:= @!(LINUX_2_6_37||LINUX_2_6_38)
KCONFIG:= \ KCONFIG:= \
CONFIG_VIDEOBUF2_CORE \ CONFIG_VIDEOBUF2_CORE \
CONFIG_VIDEOBUF2_MEMOPS \ CONFIG_VIDEOBUF2_MEMOPS \
@ -99,7 +98,7 @@ $(eval $(call KernelPackage,video-sn9c102))
define KernelPackage/video-pwc define KernelPackage/video-pwc
TITLE:=Philips USB webcam support 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:= \ KCONFIG:= \
CONFIG_USB_PWC \ CONFIG_USB_PWC \
CONFIG_USB_PWC_DEBUG=n CONFIG_USB_PWC_DEBUG=n
@ -117,7 +116,7 @@ $(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support 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 KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo) AUTOLOAD:=$(call AutoLoad,90,uvcvideo)