From 36ee230fcaa1f1280045f54ce679db9790f0828d Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 29 Apr 2010 10:25:57 +0000
Subject: [PATCH] package/kernel: mark a bunch of kmod packages that don't
 exist on 2.4 as 2.6 only

SVN-Revision: 21251
---
 package/kernel/modules/block.mk      | 5 ++++-
 package/kernel/modules/crypto.mk     | 6 ++++--
 package/kernel/modules/fs.mk         | 4 ++--
 package/kernel/modules/netdevices.mk | 3 ++-
 package/kernel/modules/netsupport.mk | 4 +++-
 package/kernel/modules/other.mk      | 5 +++++
 package/kernel/modules/usb.mk        | 3 +++
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 6ffda26f88..8a4c68a882 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -10,6 +10,7 @@ BLOCK_MENU:=Block Devices
 define KernelPackage/aoe
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=ATA over Ethernet support
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_ATA_OVER_ETH
   FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,aoe)
@@ -164,6 +165,7 @@ $(eval $(call KernelPackage,ata-via-sata))
 define KernelPackage/block2mtd
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Block device MTD emulation
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_MTD_BLOCK2MTD
   FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX)
 endef
@@ -174,6 +176,7 @@ $(eval $(call KernelPackage,block2mtd))
 define KernelPackage/dm
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Device Mapper
+  DEPENDS:=@LINUX_2_6
   # All the "=n" are unnecessary, they're only there
   # to stop the config from asking the question.
   # MIRROR is M because I've needed it for pvmove.
@@ -334,7 +337,7 @@ $(eval $(call KernelPackage,ide-pdc202xx))
 
 define KernelPackage/ide-it821x
   TITLE:=ITE IT821x IDE driver
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT
   KCONFIG:=CONFIG_BLK_DEV_IT821X
   FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,it821x,1)
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 859e8a563e..7c6835135d 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -64,6 +64,7 @@ endef
 
 define KernelPackage/crypto-hw-padlock
   TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
+  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_CRYPTO_HW=y \
 	CONFIG_CRYPTO_DEV_PADLOCK \
@@ -81,6 +82,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
 
 define KernelPackage/crypto-hw-geode
   TITLE:=AMD Geode hardware crypto module
+  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_CRYPTO_HW=y \
 	CONFIG_CRYPTO_DEV_GEODE
@@ -94,7 +96,7 @@ $(eval $(call KernelPackage,crypto-hw-geode))
 
 define KernelPackage/crypto-hw-hifn-795x
   TITLE:=HIFN 795x crypto accelerator
-  DEPENDS:=@!TARGET_ubicom32
+  DEPENDS:=@LINUX_2_6 @!TARGET_ubicom32
   KCONFIG:= \
 	CONFIG_CRYPTO_HW=y \
 	CONFIG_HW_RANDOM=y \
@@ -291,7 +293,7 @@ $(eval $(call KernelPackage,crypto-misc))
 
 define KernelPackage/crypto-ocf
   TITLE:=OCF modules
-  DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml
+  DEPENDS:=@LINUX_2_6 +@OPENSSL_ENGINE @!TARGET_uml
   KCONFIG:= \
 	CONFIG_OCF_OCF \
 	CONFIG_OCF_CRYPTODEV \
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 30190f8640..d411b1e518 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -25,12 +25,12 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
+  # for crc32c
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-misc
   KCONFIG:=\
 	CONFIG_LIBCRC32C \
 	CONFIG_BTRFS_FS \
 	CONFIG_BTRFS_FS_POSIX_ACL=n
-  # for crc32c
-  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc
   FILES:=\
 	$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX)
diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index f561e01cd8..5c439ab29e 100644
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -10,6 +10,7 @@ NETWORK_DEVICES_MENU:=Network Devices
 define KernelPackage/libphy
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=PHY library
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_PHYLIB
   FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,libphy)
@@ -318,7 +319,7 @@ $(eval $(call KernelPackage,ssb-gige))
 define KernelPackage/hfcmulti
   TITLE:=HFC multiport cards (HFC-4S/8S/E1)
   KCONFIG:=CONFIG_MISDN_HFCMULTI
-  DEPENDS:=+kmod-misdn
+  DEPENDS:=@LINUX_2_6 +kmod-misdn
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,hfcmulti)
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index de044789eb..c8c5f67500 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -106,6 +106,7 @@ $(eval $(call KernelPackage,capi))
 define KernelPackage/misdn
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=mISDN (ISDN) Support
+  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
   	CONFIG_MISDN \
 	CONFIG_MISDN_DSP \
@@ -137,6 +138,7 @@ $(eval $(call KernelPackage,misdn))
 define KernelPackage/isdn4linux
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Old ISDN4Linux (deprecated)
+  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
     CONFIG_ISDN_I4L \
     CONFIG_ISDN_PPP=y \
@@ -496,7 +498,7 @@ $(eval $(call KernelPackage,pppoa))
 define KernelPackage/pppol2tp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoL2TP support
-  DEPENDS:=kmod-ppp +kmod-pppoe
+  DEPENDS:=@LINUX_2_6 kmod-ppp +kmod-pppoe
   KCONFIG:=CONFIG_PPPOL2TP
   FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 557fc7c1c7..403af57a73 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -92,6 +92,7 @@ $(eval $(call KernelPackage,bluetooth))
 define KernelPackage/crc-ccitt
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC-CCITT support
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_CRC_CCITT
   FILES:=$(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,crc-ccitt)
@@ -107,6 +108,7 @@ $(eval $(call KernelPackage,crc-ccitt))
 define KernelPackage/crc-itu-t
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC ITU-T V.41 support
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_CRC_ITU_T
   FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,crc-itu-t)
@@ -122,6 +124,7 @@ $(eval $(call KernelPackage,crc-itu-t))
 define KernelPackage/crc7
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC7 support
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_CRC7
   FILES:=$(LINUX_DIR)/lib/crc7.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,crc7)
@@ -465,6 +468,7 @@ $(eval $(call KernelPackage,leds-wrap))
 define KernelPackage/ledtrig-morse
   SUBMENU:=$(OTHER_MENU)
   TITLE:=LED Morse Trigger
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE
   FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse)
@@ -480,6 +484,7 @@ $(eval $(call KernelPackage,ledtrig-morse))
 define KernelPackage/ledtrig-netdev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=LED NETDEV Trigger
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV
   FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev)
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index ac879fc1fa..7ead8fc89f 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -341,6 +341,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303))
 
 define KernelPackage/usb-serial-cp210x
   TITLE:=Support for Silicon Labs cp210x devices
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_USB_SERIAL_CP210X
   FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,cp210x)
@@ -403,6 +404,7 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless))
 
 define KernelPackage/usb-serial-motorola-phone
   TITLE:=Support for Motorola usb phone
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA
   FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,moto_modem)
@@ -433,6 +435,7 @@ $(eval $(call KernelPackage,usb-serial-visor))
 
 define KernelPackage/usb-serial-cypress-m8
   TITLE:=Support for CypressM8 USB-Serial
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8
   FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,65,cypress_m8)