diff options
| author | Nicolas Thill <nico@openwrt.org> | 2011-10-28 19:16:27 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2011-10-28 19:16:27 +0000 |
| commit | 01fcc80afcfc94790f5c392211685df6ef701fc4 (patch) | |
| tree | 312d0c2d28cf420e9fbe4eadaf2c59d9a8100480 | |
| parent | 897ab36e93127a9e27f36a4c2d34b30e6eb70834 (diff) | |
| download | upstream-01fcc80afcfc94790f5c392211685df6ef701fc4.tar.gz upstream-01fcc80afcfc94790f5c392211685df6ef701fc4.tar.bz2 upstream-01fcc80afcfc94790f5c392211685df6ef701fc4.zip | |
package/kernel: enable kmod-ata-core & kmod-scsi-core on x86
SVN-Revision: 28662
| -rw-r--r-- | package/kernel/modules/block.mk | 9 | ||||
| -rw-r--r-- | package/kernel/modules/firewire.mk | 2 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 41509b01b8..6d67e72f72 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -25,7 +25,7 @@ $(eval $(call KernelPackage,aoe)) define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) + DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax) KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) @@ -36,7 +36,7 @@ $(eval $(call KernelPackage,ata-core)) define AddDepends/ata SUBMENU:=$(BLOCK_MENU) - DEPENDS+=!TARGET_x86:kmod-ata-core $(1) + DEPENDS+=kmod-ata-core $(1) endef @@ -612,7 +612,6 @@ $(eval $(call KernelPackage,nbd)) define KernelPackage/scsi-core SUBMENU:=$(BLOCK_MENU) TITLE:=SCSI device support - DEPENDS:=@!TARGET_x86 KCONFIG:= \ CONFIG_SCSI \ CONFIG_BLK_DEV_SD @@ -628,7 +627,7 @@ $(eval $(call KernelPackage,scsi-core)) define KernelPackage/scsi-generic SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for SCSI generic - DEPENDS:=+!TARGET_x86:kmod-scsi-core + DEPENDS:=+kmod-scsi-core KCONFIG:= \ CONFIG_CHR_DEV_SG FILES:= \ @@ -642,7 +641,7 @@ $(eval $(call KernelPackage,scsi-generic)) define KernelPackage/scsi-cdrom SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for CD / DVD drives - DEPENDS:=+!TARGET_x86:kmod-scsi-core + DEPENDS:=+kmod-scsi-core KCONFIG:= \ CONFIG_BLK_DEV_SR \ CONFIG_BLK_DEV_SR_VENDOR=n diff --git a/package/kernel/modules/firewire.mk b/package/kernel/modules/firewire.mk index 10d144ce75..0c8f75cdf9 100644 --- a/package/kernel/modules/firewire.mk +++ b/package/kernel/modules/firewire.mk @@ -130,7 +130,7 @@ $(eval $(call KernelPackage,firewire-ohci)) define KernelPackage/firewire-sbp2 SUBMENU:=$(FIREWIRE_MENU) TITLE:=Support for SBP-2 devices over FireWire - DEPENDS:=kmod-firewire +!TARGET_x86:kmod-scsi-core + DEPENDS:=kmod-firewire +kmod-scsi-core KCONFIG:=CONFIG_FIREWIRE_SBP2 FILES:=$(LINUX_DIR)/drivers/firewire/firewire-sbp2.ko AUTOLOAD:=$(call AutoLoad,50,firewire-sbp2) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 45ad0882fd..b72a346286 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -578,7 +578,7 @@ $(eval $(call KernelPackage,usb-serial-option)) define KernelPackage/usb-storage TITLE:=USB Storage support - DEPENDS:= +!TARGET_x86:kmod-scsi-core + DEPENDS:= +kmod-scsi-core KCONFIG:=CONFIG_USB_STORAGE FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.ko AUTOLOAD:=$(call AutoLoad,60,usb-storage,1) |