seniorr

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 6d73af2..ad4f37a 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -156,6 +156,7 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
   	CONFIG_IDE_GENERIC \
   	CONFIG_BLK_DEV_GENERIC \
   	CONFIG_BLK_DEV_IDE \
+  	CONFIG_BLK_DEV_IDEDISK \
   	CONFIG_IDE_GD \
   	CONFIG_IDE_GD_ATA=y \
   	CONFIG_IDE_GD_ATAPI=n \
@@ -164,7 +165,7 @@ 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)
+      AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-gd_mod)
   endef
 else
   define KernelPackage/ide-core
@@ -172,17 +173,20 @@ else
     TITLE:=IDE (ATA/ATAPI) device support
     DEPENDS:=@PCI_SUPPORT
     KCONFIG:= \
-          CONFIG_IDE \
-          CONFIG_IDE_GENERIC \
-          CONFIG_BLK_DEV_GENERIC \
-          CONFIG_BLK_DEV_IDE \
-          CONFIG_BLK_DEV_IDEDISK \
-          CONFIG_BLK_DEV_IDEDMA_PCI=y \
-          CONFIG_BLK_DEV_IDEPCI=y
+  	CONFIG_IDE \
+  	CONFIG_IDE_GENERIC \
+  	CONFIG_BLK_DEV_GENERIC \
+  	CONFIG_BLK_DEV_IDE \
+  	CONFIG_BLK_DEV_IDEDISK \
+  	CONFIG_IDE_GD \
+  	CONFIG_IDE_GD_ATA=y \
+  	CONFIG_IDE_GD_ATAPI=n \
+  	CONFIG_BLK_DEV_IDEDMA_PCI=y \
+  	CONFIG_BLK_DEV_IDEPCI=y
     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)
+  	$(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)
   endef
 endif
 
@@ -191,19 +195,18 @@ define KernelPackage/ide-core/2.4
   AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
 
-ifeq ($(and $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1), \
-	$(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)))
-  define KernelPackage/ide-core/2.6
-    FILES+=$(LINUX_DIR)/drivers/ide/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
+IDE_PCI_GENERIC_NAME=ide-generic
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)),1)
+  IDE_PCI_GENERIC_NAME=ide-pci-generic
+endif
 endif
 
+define KernelPackage/ide-core/2.6
+  FILES+=$(LINUX_DIR)/drivers/ide/$(IDE_PCI_GENERIC_NAME).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD+=$(call AutoLoad,30,$(IDE_PCI_GENERIC_NAME))
+endef
+
 define KernelPackage/ide-core/description
  Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
  Includes: