hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
owl
Hauke Mehrtens 2010-03-21 14:22:38 +00:00
parent cd2cee46ac
commit 3c2943b45a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/kernel/modules/block.mk
View File

@ -223,8 +223,14 @@ endef
ifneq ($(CONFIG_arm)$(CONFIG_powerpc),y) ifneq ($(CONFIG_arm)$(CONFIG_powerpc),y)
define KernelPackage/ide-core/2.6 define KernelPackage/ide-core/2.6
FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) ifeq ($(CONFIG_PCI_SUPPORT),y)
AUTOLOAD+=$(call AutoLoad,30,ide-generic,1) 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 endef
endif endif
@ -380,7 +386,7 @@ define KernelPackage/dm
CONFIG_BLK_DEV_DM \ CONFIG_BLK_DEV_DM \
CONFIG_DM_MIRROR CONFIG_DM_MIRROR
FILES:=$(LINUX_DIR)/drivers/md/dm-*.$(LINUX_KMOD_SUFFIX) 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 endef
define KernelPackage/dm/description define KernelPackage/dm/description
@ -475,7 +481,11 @@ define KernelPackage/mvsas
TITLE:=Marvell 88SE6440 SAS/SATA driver TITLE:=Marvell 88SE6440 SAS/SATA driver
DEPENDS:=@TARGET_x86 +kmod-libsas DEPENDS:=@TARGET_x86 +kmod-libsas
KCONFIG:=CONFIG_SCSI_MVSAS 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) AUTOLOAD:=$(call AutoLoad,40,mvsas,1)
endef endef