summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-27 21:42:38 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-27 21:42:38 +0000
commite07d1e4f95798023c8c6b59f05a3eaaf7fea8398 (patch)
tree9b7b976324055c29ada56324b2c8d09c27660edf
parentbe8ce37ea93e63a62e1f837984a0fd8271c09b07 (diff)
remove 2.6.28 specific stuff from kernel packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18954 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/block.mk19
-rw-r--r--package/kernel/modules/fs.mk22
-rw-r--r--package/kernel/modules/wireless.mk7
3 files changed, 3 insertions, 45 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index cbdf2b3a0f..3ece2342d3 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -192,17 +192,10 @@ define KernelPackage/ide-core
CONFIG_IDE_GD_ATAPI=n \
CONFIG_BLK_DEV_IDEDMA_PCI=y \
CONFIG_BLK_DEV_IDEPCI=y
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- FILES:= \
- $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-gd_mod)
-else
FILES:= \
$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk)
-endif
endef
define KernelPackage/ide-core/2.4
@@ -233,11 +226,7 @@ define KernelPackage/ide-aec62xx
TITLE:=Acard AEC62xx IDE driver
DEPENDS:=@PCI_SUPPORT +kmod-ide-core
KCONFIG:=CONFIG_BLK_DEV_AEC62XX
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX)
-else
FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
-endif
AUTOLOAD:=$(call AutoLoad,30,aec62xx)
endef
@@ -269,11 +258,7 @@ define KernelPackage/ide-pdc202xx
TITLE:=Promise PDC202xx IDE driver
DEPENDS:=+kmod-ide-core
KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
- ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
- else
FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
- endif
AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
endef
@@ -294,11 +279,7 @@ define KernelPackage/ide-it821x
TITLE:=ITE IT821x IDE driver
DEPENDS:=+kmod-ide-core
KCONFIG:=CONFIG_BLK_DEV_IT821X
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX)
-else
FILES=$(LINUX_DIR)/drivers/ide/pci/it821x.$(LINUX_KMOD_SUFFIX)
-endif
AUTOLOAD:=$(call AutoLoad,30,it821x)
endef
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 768ee4b6e1..5ff914ecdd 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -111,12 +111,6 @@ endef
$(eval $(call KernelPackage,fs-ext3))
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)),1)
- EXT4_NAME:=ext4dev
-else
- EXT4_NAME:=ext4
-endif
-
define KernelPackage/fs-ext4
SUBMENU:=$(FS_MENU)
TITLE:=EXT4 filesystem support
@@ -129,7 +123,7 @@ define KernelPackage/fs-ext4
CONFIG_JBD2
DEPENDS:= @LINUX_2_6 +kmod-crc16 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
FILES:= \
- $(LINUX_DIR)/fs/ext4/$(EXT4_NAME).$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,jbd2 $(EXT4_NAME))
endef
@@ -278,16 +272,11 @@ endef
$(eval $(call KernelPackage,fs-nfsd))
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- MSDOS_DIR:=fat
-endif
-MSDOS_DIR?=msdos
-
define KernelPackage/fs-msdos
SUBMENU:=$(FS_MENU)
TITLE:=MSDOS filesystem support
KCONFIG:=CONFIG_MSDOS_FS
- FILES:=$(LINUX_DIR)/fs/$(MSDOS_DIR)/msdos.$(LINUX_KMOD_SUFFIX)
+ FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,40,msdos)
$(call KernelPackage/nls/Depends)
endef
@@ -314,11 +303,6 @@ endef
$(eval $(call KernelPackage,fs-reiserfs))
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- VFAT_DIR:=fat
-endif
-VFAT_DIR?=vfat
-
define KernelPackage/fs-vfat
SUBMENU:=$(FS_MENU)
TITLE:=VFAT filesystem support
@@ -327,7 +311,7 @@ define KernelPackage/fs-vfat
CONFIG_VFAT_FS
FILES:= \
$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/fs/$(VFAT_DIR)/vfat.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,fat vfat)
$(call KernelPackage/nls/Depends)
endef
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 27ecfb6f74..7985a20786 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -167,13 +167,6 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
$(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,orinoco)
else
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
- FILES:= \
- $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)hermes.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)hermes_dld.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,50,hermes hermes_dld orinoco)
-else
FILES:= \
$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)