diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
commit | 269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch) | |
tree | d6e35e6da4bc19f657ac07ff8447ec065d85a4aa /target/linux/config/Config.in.block | |
parent | d1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff) | |
parent | 2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config/Config.in.block')
-rw-r--r-- | target/linux/config/Config.in.block | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 96f211e0a..d8b32c716 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -46,6 +46,7 @@ config ADK_KERNEL_DM_CRYPT config ADK_KERNEL_BLK_DEV_DM select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD boolean default n @@ -175,6 +176,7 @@ config ADK_KPACKAGE_KMOD_SCSI select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS depends on !ADK_KERNEL_SCSI + depends on !ADK_KERNEL_SATA_AHCI tristate help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or @@ -190,8 +192,8 @@ config ADK_KPACKAGE_KMOD_SCSI config ADK_KPACKAGE_KMOD_BLK_DEV_SD prompt "kmod-scsi-disk.................... SCSI disk support" + select ADK_KPACKAGE_KMOD_SCSI depends on !ADK_KERNEL_BLK_DEV_SD - depends on ADK_KPACKAGE_KMOD_SCSI tristate help If you want to use SCSI hard disks, Fibre Channel disks, @@ -215,12 +217,14 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR config ADK_KERNEL_BLK_DEV_MD tristate select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_BLK_DEV_MD prompt "kmod-md........................... RAID support" tristate depends on !ADK_KERNEL_BLK_DEV_MD + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KERNEL_MD help @@ -255,7 +259,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID456 config ADK_KPACKAGE_KMOD_BLK_DEV_DM prompt "kmod-dm........................... Device Mapper support" select ADK_KERNEL_MD - depends on !ADK_KERNEL_BLK_DEV_DM + depends on !(ADK_KERNEL_BLK_DEV_DM || ADK_LINUX_CRIS_FOXBOARD) tristate help Device-mapper is a low level volume manager. It works by allowing @@ -267,8 +271,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM config ADK_KPACKAGE_KMOD_DM_CRYPT prompt "kmod-dm-crypt................... Crypt target support" + depends on !(ADK_KERNEL_DM_CRYPT || ADK_LINUX_CRIS_FOXBOARD) select ADK_KPACKAGE_KMOD_BLK_DEV_DM - depends on !ADK_KERNEL_DM_CRYPT select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO select ADK_KPACKAGE_KMOD_CRYPTO_CBC @@ -286,6 +290,7 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT config ADK_KPACKAGE_KMOD_DM_SNAPSHOT prompt "kmod-dm-snapshot................ Snapshot target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to take writable snapshots of a device. @@ -293,6 +298,7 @@ config ADK_KPACKAGE_KMOD_DM_SNAPSHOT config ADK_KPACKAGE_KMOD_DM_MIRROR prompt "kmod-dm-mirror.................. Mirror target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to mirror logical volumes, also |