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 conditional handling of ide-support 

SVN-Revision: 15577
owl
Jo-Philipp Wich 2009-05-04 00:38:53 +00:00
parent 505ac00f4e
commit 4bead4bb96
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,28 +146,7 @@ endef
$(eval $(call KernelPackage,ata-via-sata)) $(eval $(call KernelPackage,ata-via-sata))
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1) define KernelPackage/ide-core
define KernelPackage/ide-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=IDE (ATA/ATAPI) device support
DEPENDS:=@PCI_SUPPORT
KCONFIG:= \
CONFIG_IDE \
CONFIG_IDE_GENERIC \
CONFIG_BLK_DEV_GENERIC \
CONFIG_BLK_DEV_IDE \
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-gd_mod.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-gd_mod)
endef
else
define KernelPackage/ide-core
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=IDE (ATA/ATAPI) device support TITLE:=IDE (ATA/ATAPI) device support
DEPENDS:=@PCI_SUPPORT DEPENDS:=@PCI_SUPPORT
@ -177,24 +156,32 @@ else
CONFIG_BLK_DEV_GENERIC \ CONFIG_BLK_DEV_GENERIC \
CONFIG_BLK_DEV_IDE \ CONFIG_BLK_DEV_IDE \
CONFIG_BLK_DEV_IDEDISK \ 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_IDEDMA_PCI=y \
CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEPCI=y
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)
else
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk) AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk)
endef
endif endif
endef
define KernelPackage/ide-core/2.4 define KernelPackage/ide-core/2.4
FILES+=$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) FILES+=$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX)
AUTOLOAD+=$(call AutoLoad,30,ide-detect) AUTOLOAD+=$(call AutoLoad,30,ide-detect)
endef endef
ifeq ($(and $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1), \ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),eq,2.6.26)),1)
$(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)))
define KernelPackage/ide-core/2.6 define KernelPackage/ide-core/2.6
FILES+=$(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX) FILES+=$(LINUX_DIR)/drivers/ide/pci/ide-pci-generic.$(LINUX_KMOD_SUFFIX)
AUTOLOAD+=$(call AutoLoad,30,ide-pci-generic) AUTOLOAD+=$(call AutoLoad,30,ide-pci-generic)
endef endef
else else