simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 70f73db..cbba65d 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -3,7 +3,7 @@ BLMENU:=Block Devices
 define KernelPackage/libata
        TITLE:=libata
        DESCRIPTION:=libata
 define KernelPackage/libata
        TITLE:=libata
        DESCRIPTION:=libata

-       KCONFIG:=$(CONFIG_ATA)
+       KCONFIG:=CONFIG_ATA

        SUBMENU:=$(BLMENU)
        FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
 endef
        SUBMENU:=$(BLMENU)
        FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
 endef


@@ -12,21 +12,21 @@ $(eval $(call KernelPackage,libata))
 define KernelPackage/ata-piix
        TITLE:=ata-piix
        DESCRIPTION:=Kernel module for Intel PIIX SATA controller
 define KernelPackage/ata-piix
        TITLE:=ata-piix
        DESCRIPTION:=Kernel module for Intel PIIX SATA controller

-       KCONFIG:=$(CONFIG_ATA_PIIX)
+       KCONFIG:=CONFIG_ATA_PIIX

        SUBMENU:=$(BLMENU)
        AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
        FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
        SUBMENU:=$(BLMENU)
        AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
        FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)

-       DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
+       DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core @PCI_SUPPORT

 endef
 $(eval $(call KernelPackage,ata-piix))
 
 define KernelPackage/pata-artop
        TITLE:=pata-artop
        DESCRIPTION:=Kernel module for ARTOP PATA controller
 endef
 $(eval $(call KernelPackage,ata-piix))
 
 define KernelPackage/pata-artop
        TITLE:=pata-artop
        DESCRIPTION:=Kernel module for ARTOP PATA controller

-       KCONFIG:=$(CONFIG_PATA_ARTOP)
+       KCONFIG:=CONFIG_PATA_ARTOP

        SUBMENU:=$(BLMENU)
        AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
        FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
        SUBMENU:=$(BLMENU)
        AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
        FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)

-       DEPENDS:=+kmod-libata +kmod-scsi-core
+       DEPENDS:=kmod-libata +kmod-scsi-core @PCI_SUPPORT

 endef
 $(eval $(call KernelPackage,pata-artop))
 endef
 $(eval $(call KernelPackage,pata-artop))