From 2850136ae836bf8aa292f778babfc2ae02fc78eb Mon Sep 17 00:00:00 2001
From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Sun, 15 May 2011 09:37:28 +0000
Subject: package/kernel: Remove all 2.4 definitions

With no 2.4 support in trunk, we can safely remove any 2.4 definitions for
kmods and merge the 2.6 definitions into the generic ones.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>

SVN-Revision: 26901
---
 package/kernel/modules/block.mk | 47 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

(limited to 'package/kernel/modules/block.mk')

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 75f888590a..28935804f3 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -374,24 +374,10 @@ define KernelPackage/ide-core
 	CONFIG_BLK_DEV_IDEDMA_PCI=y \
 	CONFIG_BLK_DEV_IDEPCI=y
   FILES:= \
-	$(LINUX_DIR)/drivers/ide/ide-core.ko
+	$(LINUX_DIR)/drivers/ide/ide-core.ko \
+	$(LINUX_DIR)/drivers/ide/ide-gd_mod.ko
   AUTOLOAD:= \
-	$(call AutoLoad,20,ide-core,1)
-endef
-
-define KernelPackage/ide-core/2.4
-  FILES+= \
-	$(LINUX_DIR)/drivers/ide/ide-detect.ko \
-  	$(LINUX_DIR)/drivers/ide/ide-disk.ko
-  AUTOLOAD+= \
-	$(call AutoLoad,35,ide-detect,1) \
-	$(call AutoLoad,40,ide-disk,1)
-endef
-
-define KernelPackage/ide-core/2.6
-  FILES+= \
-  	$(LINUX_DIR)/drivers/ide/ide-gd_mod.ko
-  AUTOLOAD+= \
+	$(call AutoLoad,20,ide-core,1) \
 	$(call AutoLoad,40,ide-gd_mod,1)
 endef
 
@@ -399,8 +385,7 @@ define KernelPackage/ide-core/description
  Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
  Includes:
  - ide-core
- - ide-detect
- - ide-gd_mod (or ide-disk)
+ - ide-gd_mod
 endef
 
 $(eval $(call KernelPackage,ide-core))
@@ -417,23 +402,11 @@ define KernelPackage/ide-generic
   DEPENDS:=@PCI_SUPPORT
   TITLE:=Kernel support for generic PCI IDE chipsets
   KCONFIG:=CONFIG_BLK_DEV_GENERIC
+  FILES:=$(LINUX_DIR)/drivers/ide/ide-pci-generic.ko
+  AUTOLOAD:=$(call AutoLoad,30,ide-pci-generic,1)
   $(call AddDepends/ide)
 endef
 
-define KernelPackage/ide-generic/2.4
-  FILES+= \
-	$(LINUX_DIR)/drivers/ide/pci/generic.ko
-  AUTOLOAD+= \
-	$(call AutoLoad,30,generic,1)
-endef
-
-define KernelPackage/ide-generic/2.6
-  FILES+= \
-	$(LINUX_DIR)/drivers/ide/ide-pci-generic.ko
-  AUTOLOAD+= \
-	$(call AutoLoad,30,ide-pci-generic,1)
-endef
-
 $(eval $(call KernelPackage,ide-generic))
 
 
@@ -458,10 +431,6 @@ define KernelPackage/ide-aec62xx
   $(call AddDepends/ide)
 endef
 
-define KernelPackage/ide-aec62xx/2.4
-  FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.ko
-endef
-
 define KernelPackage/ide-aec62xx/description
  Support for Acard AEC62xx (Artop ATP8xx) IDE controllers.
 endef
@@ -478,10 +447,6 @@ define KernelPackage/ide-pdc202xx
   $(call AddDepends/ide)
 endef
 
-define KernelPackage/ide-pdc202xx/2.4
-  FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.ko
-endef
-
 define KernelPackage/ide-pdc202xx/description
  Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE
  controllers.
-- 
cgit v1.2.3