kernel: fix some minor error:

 * module ide-pci-generic is also included if it was build
 * correct loading queue for kmod-dm
 * place for mvsas.ko changed in new kernel.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20348 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 009a8e168274c44965a4719cdef0aa6ec4c98f94..db462428499eca7941beb38f038fc56b46e3e5f0 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -223,8 +223,14 @@ endef
 
 ifneq ($(CONFIG_arm)$(CONFIG_powerpc),y)
   define KernelPackage/ide-core/2.6
-    FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
-    AUTOLOAD+=$(call AutoLoad,30,ide-generic,1)
+       ifeq ($(CONFIG_PCI_SUPPORT),y)
+         FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) \
+               $(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX)
+         AUTOLOAD+=$(call AutoLoad,30,ide-generic ide-pci-generic,1)
+       else
+         FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
+         AUTOLOAD+=$(call AutoLoad,30,ide-generic,1)
+       endif
   endef
 endif
 
@@ -380,7 +386,7 @@ define KernelPackage/dm
        CONFIG_BLK_DEV_DM \
        CONFIG_DM_MIRROR
   FILES:=$(LINUX_DIR)/drivers/md/dm-*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-region-hash dm-mirror dm-log)
+  AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror)
 endef
 
 define KernelPackage/dm/description
@@ -475,7 +481,11 @@ define KernelPackage/mvsas
   TITLE:=Marvell 88SE6440 SAS/SATA driver
   DEPENDS:=@TARGET_x86 +kmod-libsas
   KCONFIG:=CONFIG_SCSI_MVSAS
-  FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.$(LINUX_KMOD_SUFFIX)
+  ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30),)
+       FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.$(LINUX_KMOD_SUFFIX)
+  else
+       FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.$(LINUX_KMOD_SUFFIX)
+  endif
   AUTOLOAD:=$(call AutoLoad,40,mvsas,1)
 endef