[kernel] aec62xx is working with kernel 2.6.28 agagin.

[openwrt/svn-archive/archive.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 44fd8c1c0e3de6af8325d6f5463255aae5a6e2be..a7b6ef24154d5317e60287a3fe424f3d92786792 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -70,7 +70,7 @@ $(eval $(call KernelPackage,ata-ixp4xx-cf))
 define KernelPackage/ata-rb532-cf
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=RB532 Compact Flash support
-  DEPENDS:=@TARGET_rb532 kmod-ata-core
+  DEPENDS:=@TARGET_rb532 kmod-ata-core @BROKEN
   KCONFIG:= \
        CONFIG_PATA_PLATFORM \
        CONFIG_PATA_RB532
@@ -131,6 +131,7 @@ endef
 $(eval $(call KernelPackage,ata-via-sata))
 
 
+# XXX: broken on 2.6.28 due to module name/path changes
 define KernelPackage/ide-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=IDE (ATA/ATAPI) device support
@@ -182,7 +183,11 @@ 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