diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-03-21 14:22:38 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-03-21 14:22:38 +0000 |
| commit | 3c2943b45a0454c832cef6c283ce0695ce1e987e (patch) | |
| tree | 8b954279835ff6014ef443285e457fd6132b6d60 /package | |
| parent | cd2cee46ac093a1ac8129a53421019cd8ab4470c (diff) | |
| download | upstream-3c2943b45a0454c832cef6c283ce0695ce1e987e.tar.gz upstream-3c2943b45a0454c832cef6c283ce0695ce1e987e.tar.bz2 upstream-3c2943b45a0454c832cef6c283ce0695ce1e987e.zip | |
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.
SVN-Revision: 20348
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/modules/block.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 009a8e1682..db46242849 100644 --- 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 |