X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fblock.mk;h=3f8bd465b33f3a929351f5cc43b4d2123fa03d5f;hb=017763749292a0e9889476ac1a503bd5f4e2f229;hp=df9506f209fe60c23c9b6aadeca6e61d1e876d42;hpb=b389d9e3e65f48e64bd9a44fd8ef9c7a6f168013;p=openwrt-10.03%2F.git

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index df9506f20..3f8bd465b 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -83,7 +83,7 @@ $(eval $(call KernelPackage,ata-nvidia-sata))
 define KernelPackage/ata-piix
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Intel PIIX PATA/SATA support
-  DEPENDS:=kmod-ata-core +kmod-ide-core
+  DEPENDS:=kmod-ata-core
   KCONFIG:=CONFIG_ATA_PIIX
   FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ata_piix)
@@ -119,6 +119,7 @@ define KernelPackage/ide-core
   KCONFIG:= \
 	CONFIG_IDE \
 	CONFIG_IDE_GENERIC \
+	CONFIG_BLK_DEV_GENERIC \
 	CONFIG_BLK_DEV_IDE \
 	CONFIG_IDE_GENERIC \
 	CONFIG_BLK_DEV_IDEDISK \
@@ -135,10 +136,17 @@ define KernelPackage/ide-core/2.4
   AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
 
-define KernelPackage/ide-core/2.6
-  FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD+=$(call AutoLoad,30,ide-generic)
-endef
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
+  define KernelPackage/ide-core/2.6
+    FILES+=$(LINUX_DIR)/drivers/ide/pci/ide-pci-generic.$(LINUX_KMOD_SUFFIX)
+    AUTOLOAD+=$(call AutoLoad,30,ide-pci-generic)
+  endef
+else
+  define KernelPackage/ide-core/2.6
+    FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
+    AUTOLOAD+=$(call AutoLoad,30,ide-generic)
+  endef
+endif
 
 define KernelPackage/ide-core/description
  Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)