diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/kernel/modules/block.mk | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/kernel/modules/block.mk')
| -rw-r--r-- | package/kernel/modules/block.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index ba2443957..1aa47def2 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_etrax + DEPENDS:=@PCI_SUPPORT +kmod-scsi-core KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) @@ -356,7 +356,7 @@ define KernelPackage/md-raid456/description async_memcpy.ko async_pq.ko async_raid5_recov.ko - raid6_pq.ko + raid6_pq.ko endef $(eval $(call KernelPackage,md-raid456)) |