summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/config/Config.in.block3
-rw-r--r--target/linux/config/Config.in.fs1
-rw-r--r--target/linux/config/Config.in.fsnet2
3 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index cf5e7a270..614938f1d 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -175,6 +175,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 +191,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,
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 8541065f0..d533a3213 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -14,6 +14,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET
config ADK_KPACKAGE_KMOD_EXPORTFS
tristate
+ depends on !ADK_KERNEL_EXPORTFS
default n
help
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 71236c47f..f87aeb9db 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -92,7 +92,7 @@ config ADK_KPACKAGE_KMOD_NFSD
prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
tristate
default n
- select ADK_KPACKAGE_KMOD_EXPORTFS
+ select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS
select ADK_KERNEL_NFSD_V3
depends on ADK_KPACKAGE_KMOD_NFS_FS
help