[etrax] fix kernel modules dependences for i2c and ata-core

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

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 67b851f..92b9e63 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -10,7 +10,7 @@ BLOCK_MENU:=Block Devices
 define KernelPackage/ata-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Serial and Parallel ATA support
 define KernelPackage/ata-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Serial and Parallel ATA support

-  DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @!TARGET_ubicom32
+  DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax)

   KCONFIG:=CONFIG_ATA
   FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,21,libata,1)
   KCONFIG:=CONFIG_ATA
   FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,21,libata,1)


@@ -142,15 +142,15 @@ $(eval $(call KernelPackage,ata-nvidia-sata))
 
 
 define KernelPackage/ata-magicbox-cf
 
 
 define KernelPackage/ata-magicbox-cf

-$(call KernelPackage/ata/Depends,@TARGET_ppc40x @BROKEN)
-  TITLE:=Magicbox v2/OpenRB Compact flash support (ATA)
+$(call KernelPackage/ata/Depends,@TARGET_ppc40x)
+  TITLE:=Magicbox v2/OpenRB Compact flash support

   KCONFIG:=CONFIG_PATA_MAGICBOX_CF
   FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_magicbox_cf,1)
 endef
 
 define KernelPackage/ata-magicbox-cf/description
   KCONFIG:=CONFIG_PATA_MAGICBOX_CF
   FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_magicbox_cf,1)
 endef
 
 define KernelPackage/ata-magicbox-cf/description

-  Support for Magicbox v2/OpenRB on-board CF slot. (ATA version).
+  Support for Magicbox v2/OpenRB on-board CF slot.

 endef
 
 $(eval $(call KernelPackage,ata-magicbox-cf))
 endef
 
 $(eval $(call KernelPackage,ata-magicbox-cf))


@@ -264,21 +264,6 @@ endef
 $(eval $(call KernelPackage,ide-aec62xx,1))
 
 
 $(eval $(call KernelPackage,ide-aec62xx,1))
 
 

-define KernelPackage/ide-magicbox
-$(call KernelPackage/ide/Depends,@TARGET_ppc40x @BROKEN)
-  TITLE:=Magicbox v2/OpenRB Compact flash support (IDE)
-  KCONFIG:=CONFIG_BLK_DEV_IDE_MAGICBOX
-  FILES:=$(LINUX_DIR)/drivers/ide/magicbox_ide.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,magicbox_ide,1)
-endef
-
-define KernelPackage/ide-magicbox/description
- Support for Magicbox v2/OpenRB on-board CF slot. (IDE version).
-endef
-
-$(eval $(call KernelPackage,ide-magicbox))
-
-

 define KernelPackage/ide-pdc202xx
 $(call KernelPackage/ide/Depends,@PCI_SUPPORT)
   TITLE:=Promise PDC202xx IDE driver
 define KernelPackage/ide-pdc202xx
 $(call KernelPackage/ide/Depends,@PCI_SUPPORT)
   TITLE:=Promise PDC202xx IDE driver