remove linux 2.4 support from several packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21954 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 19 insertions, 189 deletions

diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk
index 5bba0870e..61d892198 100644
--- a/package/kernel/modules/001-depends.mk
+++ b/package/kernel/modules/001-depends.mk
@@ -8,11 +8,11 @@
 # XXX: xburst has CONFIG_CRC16=y because of CONFIG_UBIFS_FS=y
 
 define SetDepends/crc16
-  DEPENDS:= @!(LINUX_2_4||TARGET_xburst)
+  DEPENDS:= @!TARGET_xburst
 endef
 
 define AddDepends/crc16
-  DEPENDS+= +!(LINUX_2_4||TARGET_xburst):kmod-crc16 $(1)
+  DEPENDS+= +!TARGET_xburst:kmod-crc16 $(1)
 endef
 
 
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index c8c5f6750..32448d481 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -106,8 +106,8 @@ $(eval $(call KernelPackage,capi))
 define KernelPackage/misdn
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=mISDN (ISDN) Support
-  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
+	CONFIG_ISDN=y \
   	CONFIG_MISDN \
 	CONFIG_MISDN_DSP \
 	CONFIG_MISDN_L1OIP
@@ -118,16 +118,6 @@ define KernelPackage/misdn
   AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip)
 endef
 
-define KernelPackage/misdn/2.4
-  KCONFIG+= \
-	CONFIG_ISDN
-endef
-
-define KernelPackage/misdn/2.6
-   KCONFIG+= \
-	CONFIG_ISDN=y
-endef
-
 define KernelPackage/misdn/description
   Modular ISDN driver support
 endef
@@ -140,6 +130,7 @@ define KernelPackage/isdn4linux
   TITLE:=Old ISDN4Linux (deprecated)
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
+	CONFIG_ISDN=y \
     CONFIG_ISDN_I4L \
     CONFIG_ISDN_PPP=y \
     CONFIG_ISDN_PPP_VJ=y \
@@ -153,23 +144,10 @@ define KernelPackage/isdn4linux
     CONFIG_ISDN_X25=y \
     CONFIG_ISDN_DIVERSION
   FILES:= \
-    $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
-endef
-
-define KernelPackage/isdn4linux/2.4
-  KCONFIG+= \
-	CONFIG_ISDN
-  FILES+= \
-	$(LINUX_DIR)/drivers/isdn/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/isdn4linux/2.6
-  KCONFIG+= \
-	CONFIG_ISDN=y
-  FILES+= \
+    $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/isdn/i4l/isdn.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
 endef
 
 define KernelPackage/isdn4linux/description
@@ -360,10 +338,9 @@ endef
 $(eval $(call KernelPackage,ipv6))
 
 
-# sit is not selectable on 2.4, but built when ipv6 is enabled
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
-  DEPENDS:=+kmod-ipv6 +LINUX_2_6:kmod-iptunnel4
+  DEPENDS:=+kmod-ipv6 +kmod-iptunnel4
   TITLE:=IPv6-in-IPv4 tunnelling
   KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT
   FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
@@ -534,16 +511,6 @@ define KernelPackage/mppe
   KCONFIG:= \
 	CONFIG_PPP_MPPE_MPPC \
 	CONFIG_PPP_MPPE
-endef
-
-define KernelPackage/mppe/2.4
-#  KCONFIG:=CONFIG_PPP_MPPE_MPPC
-  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
-endef
-
-define KernelPackage/mppe/2.6
-#  KCONFIG:=CONFIG_PPP_MPPE
   FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
diff --git a/package/kernel/modules/nls.mk b/package/kernel/modules/nls.mk
index 26d55d987..7c4f20353 100644
--- a/package/kernel/modules/nls.mk
+++ b/package/kernel/modules/nls.mk
@@ -6,7 +6,7 @@
 #
 
 define AddDepends/nls
-  DEPENDS+= +!LINUX_2_4:kmod-nls-base
+  DEPENDS+= +kmod-nls-base
 endef
 
 define KernelPackage/nls-base
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index de60e6920..960b730d8 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -7,11 +7,7 @@
 
 OTHER_MENU:=Other modules
 
-# XXX: added a workaround for watchdog path changes
-ifeq ($(KERNEL),2.4)
-  WATCHDOG_DIR=char
-endif
-WATCHDOG_DIR?=watchdog
+WATCHDOG_DIR:=watchdog
 
 
 define KernelPackage/bluetooth
@@ -39,37 +35,6 @@ define KernelPackage/bluetooth
   $(call AddDepends/crc16)
   $(call AddDepends/hid)
   $(call AddDepends/rfkill)
-endef
-
-define KernelPackage/bluetooth/2.4
-#  KCONFIG:= \
-#	CONFIG_BLUEZ \
-#	CONFIG_BLUEZ_L2CAP \
-#	CONFIG_BLUEZ_SCO \
-#	CONFIG_BLUEZ_RFCOMM \
-#	CONFIG_BLUEZ_BNEP \
-#	CONFIG_BLUEZ_HCIUART \
-#	CONFIG_BLUEZ_HCIUSB
-  FILES:= \
-	$(LINUX_DIR)/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm bnep hci_uart hci_usb)
-endef
-
-define KernelPackage/bluetooth/2.6
-#  KCONFIG:= \
-#	CONFIG_BT \
-#	CONFIG_BT_L2CAP \
-#	CONFIG_BT_SCO \
-#	CONFIG_BT_RFCOMM \
-#	CONFIG_BT_BNEP \
-#	CONFIG_BT_HCIUSB \
-#	CONFIG_BT_HCIUART
   FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -286,22 +251,14 @@ define KernelPackage/input-core
   TITLE:=Input device core
   KCONFIG:=CONFIG_INPUT
   $(call SetDepends/input)
+  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,19,input-core)
 endef
 
 define KernelPackage/input-core/description
  Kernel modules for support of input device
 endef
 
-define KernelPackage/input-core/2.4
-  FILES:=$(LINUX_DIR)/drivers/input/input.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,19,input)
-endef
-
-define KernelPackage/input-core/2.6
-  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,19,input-core)
-endef
-
 $(eval $(call KernelPackage,input-core))
 
 
@@ -521,7 +478,7 @@ $(eval $(call KernelPackage,ledtrig-netdev))
 define KernelPackage/lp
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Parallel port and line printer support
-  DEPENDS:=@LINUX_2_4
+  DEPENDS:=@BROKEN
   KCONFIG:= \
 	CONFIG_PARPORT \
 	CONFIG_PRINTER \
@@ -533,19 +490,6 @@ define KernelPackage/lp
   AUTOLOAD:=$(call AutoLoad,50,parport lp)
 endef
 
-define KernelPackage/lp/2.4
-  FILES:= \
-	$(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/parport/parport_*.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50, \
-  	parport \
-  	parport_splink \
-  	lp \
-  )
-endef
-
 $(eval $(call KernelPackage,lp))
 
 
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 7ead8fc89..dc0479f60 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -7,11 +7,7 @@
 
 USB_MENU:=USB Support
 
-ifneq ($(CONFIG_LINUX_2_4),)
-  USBNET_DIR:=usb/net
-endif
-
-USBNET_DIR?=net/usb
+USBNET_DIR:=net/usb
 USBHID_DIR?=hid/usbhid
 USBINPUT_DIR?=input/misc
 
@@ -20,15 +16,8 @@ define KernelPackage/usb-core
   TITLE:=Support for USB
   DEPENDS:=@USB_SUPPORT +LINUX_2_6_31:kmod-nls-base +LINUX_2_6_32:kmod-nls-base +LINUX_2_6_33:kmod-nls-base +LINUX_2_6_34:kmod-nls-base
   KCONFIG:=CONFIG_USB
-  AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
-endef
-
-define KernelPackage/usb-core/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/usb-core/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
 endef
 
 define KernelPackage/usb-core/description
@@ -49,19 +38,9 @@ define KernelPackage/usb-uhci
   KCONFIG:= \
 	CONFIG_USB_UHCI_ALT \
 	CONFIG_USB_UHCI_HCD
-  $(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-uhci/2.4
-#  KCONFIG:=CONFIG_USB_UHCI_ALT
-  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
-  AUTOLOAD:=$(call AutoLoad,50,uhci,1)
-endef
-
-define KernelPackage/usb-uhci/2.6
-#  KCONFIG:=CONFIG_USB_UHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,50,uhci-hcd,1)
+  $(call AddDepends/usb)
 endef
 
 define KernelPackage/usb-uhci/description
@@ -71,41 +50,15 @@ endef
 $(eval $(call KernelPackage,usb-uhci,1))
 
 
-define KernelPackage/usb-uhci-iv
-  TITLE:=Support for Intel/VIA UHCI controllers
-  DEPENDS:=@LINUX_2_4
-  KCONFIG:=CONFIG_USB_UHCI
-  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,usb-uhci,1)
-  $(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-uhci-iv/description
- Kernel support for Intel/VIA USB UHCI controllers
-endef
-
-$(eval $(call KernelPackage,usb-uhci-iv,1))
-
-
 define KernelPackage/usb-ohci
   TITLE:=Support for OHCI controllers
   KCONFIG:= \
 	CONFIG_USB_OHCI \
 	CONFIG_USB_OHCI_HCD \
 	CONFIG_USB_OHCI_AR71XX=y
-  $(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-ohci/2.4
-#  KCONFIG:=CONFIG_USB_OHCI
-  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o
-  AUTOLOAD:=$(call AutoLoad,50,usb-ohci,1)
-endef
-
-define KernelPackage/usb-ohci/2.6
-#  KCONFIG:=CONFIG_USB_OHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
   AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)
+  $(call AddDepends/usb)
 endef
 
 define KernelPackage/usb-ohci/description
@@ -153,17 +106,9 @@ $(eval $(call KernelPackage,usb2))
 define KernelPackage/usb-acm
   TITLE:=Support for modems/isdn controllers
   KCONFIG:=CONFIG_USB_ACM
-$(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-acm/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/acm.o
-  AUTOLOAD:=$(call AutoLoad,60,acm)
-endef
-
-define KernelPackage/usb-acm/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko
   AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
+$(call AddDepends/usb)
 endef
 
 define KernelPackage/usb-acm/description
@@ -180,16 +125,6 @@ define KernelPackage/usb-audio
 	CONFIG_SND_USB_AUDIO
   $(call AddDepends/usb)
   $(call AddDepends/sound)
-endef
-
-define KernelPackage/usb-audio/2.4
-#  KCONFIG:=CONFIG_USB_AUDIO
-  FILES:=$(LINUX_DIR)/drivers/usb/audio.o
-  AUTOLOAD:=$(call AutoLoad,60,audio)
-endef
-
-define KernelPackage/usb-audio/2.6
-#  KCONFIG:=CONFIG_SND_USB_AUDIO
   FILES:= \
 	$(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
 	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
@@ -206,17 +141,9 @@ $(eval $(call KernelPackage,usb-audio))
 define KernelPackage/usb-printer
   TITLE:=Support for printers
   KCONFIG:=CONFIG_USB_PRINTER
-  $(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-printer/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/printer.o
-  AUTOLOAD:=$(call AutoLoad,60,printer)
-endef
-
-define KernelPackage/usb-printer/2.6
   FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko
   AUTOLOAD:=$(call AutoLoad,60,usblp)
+  $(call AddDepends/usb)
 endef
 
 define KernelPackage/usb-printer/description
@@ -641,15 +568,8 @@ define KernelPackage/usb-net
   TITLE:=Kernel modules for USB-to-Ethernet convertors
   KCONFIG:=CONFIG_USB_USBNET
   AUTOLOAD:=$(call AutoLoad,60,usbnet)
-  $(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-net/2.4
-  FILES:=$(LINUX_DIR)/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/usb-net/2.6
   FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.$(LINUX_KMOD_SUFFIX)
+  $(call AddDepends/usb)
 endef
 
 define KernelPackage/usb-net/description
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 41a05ff59..0818153b5 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -10,7 +10,6 @@ WIRELESS_MENU:=Wireless Drivers
 define KernelPackage/lib80211
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack
-  DEPENDS:=@!LINUX_2_4
   KCONFIG:= \
 	CONFIG_LIB80211 \
 	CONFIG_LIB80211_CRYPT_WEP \