let usb-video load after video-core (#6214)

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

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 3fa7b1cbe130e1b9c00eb974cd9fae789084ba4a..cbdf2b3a0fd91e386bdf034a2cd2c6013e84ce6d 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
-  DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core
+  DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @!TARGET_ubicom32
   KCONFIG:=CONFIG_ATA
   FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,21,libata)
@@ -66,11 +66,26 @@ endef
 
 $(eval $(call KernelPackage,ata-artop))
 
+define KernelPackage/ata-octeon-cf
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Octeon Compact Flash support
+  DEPENDS:=kmod-ata-core @TARGET_octeon
+  KCONFIG:=CONFIG_PATA_OCTEON_CF
+  FILES:=$(LINUX_DIR)/drivers/ata/pata_octeon_cf.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,pata_octeon_cf)
+endef
+
+define KernelPackage/ata-octeon-cf/description
+  Octeon Compact Flash support.
+endef
+
+$(eval $(call KernelPackage,ata-octeon-cf))
+
 
 define KernelPackage/ata-ixp4xx-cf
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=IXP4XX Compact Flash support
-  DEPENDS:=kmod-ata-core
+  DEPENDS:=kmod-ata-core @TARGET_ixp4xx
   KCONFIG:=CONFIG_PATA_IXP4XX_CF
   FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_ixp4xx_cf)
@@ -117,9 +132,7 @@ define KernelPackage/ata-magicbox-cf
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Magicbox v2/OpenRB Compact flash support (ATA)
   DEPENDS:=@TARGET_ppc40x +kmod-ata-core
-  KCONFIG:=\
-       CONFIG_PATA_MAGICBOX_CF \
-       CONFIG_ATA_SFF=y
+  KCONFIG:=CONFIG_PATA_MAGICBOX_CF
   FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_magicbox_cf)
 endef
@@ -254,12 +267,20 @@ $(eval $(call KernelPackage,ide-magicbox))
 define KernelPackage/ide-pdc202xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Promise PDC202xx IDE driver
-  DEPENDS:=@LINUX_2_4 +kmod-ide-core
+  DEPENDS:=+kmod-ide-core
   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
+ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
+  FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+ else
   FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+ endif
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
 endef
 
+define KernelPackage/ide-pdc202xx/2.4
+  FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+endef
+
 define KernelPackage/ide-pdc202xx/description
  Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE
  controllers.
@@ -413,11 +434,14 @@ define KernelPackage/libsas
   TITLE:=SAS Domain Transport Attributes
   DEPENDS:=+kmod-scsi-core @TARGET_x86
   KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
+       CONFIG_SCSI_SAS_ATTRS \
        CONFIG_SCSI_SAS_ATA=y \
        CONFIG_SCSI_SAS_HOST_SMP=y \
        CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
-  FILES:=$(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,29,libsas)
+  FILES:= \
+       $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas)
 endef
 
 define KernelPackage/libsas/description