summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-12-15 14:09:00 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-12-15 14:09:00 +0100
commit0e14700702f06f09f25bc861e2642a6d42da982b (patch)
tree836903db80f85bfca84ad3fbdc1af642abafb1fd /target/linux/config
parent1d41dfd46f6f45ed351a677fb22eea072c6530df (diff)
need to merge third patch from Phil manually. disable on non Linux hosts
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.block4
-rw-r--r--target/linux/config/Config.in.fs6
2 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index bbd9ce745..fb5bf080f 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI
config ADK_KERNEL_BLK_DEV_SD
boolean
+config ADK_KERNEL_BLK_DEV_SR
+ boolean
+
config ADK_KERNEL_ISCSI_TCP
boolean
@@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD
config ADK_KPACKAGE_KMOD_BLK_DEV_SR
prompt "kmod-scsi-cdrom................... SCSI CDROM support"
depends on !ADK_KERNEL_SCSI
+ depends on !ADK_KERNEL_BLK_DEV_SR
depends on ADK_KPACKAGE_KMOD_SCSI
tristate
help
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index ab048805e..9bdc6b9e5 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -227,7 +227,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS
fuse-utils.
config ADK_KERNEL_JOLIET
- bool
+ boolean
+ default n
+
+config ADK_KERNEL_ISO9660_FS
+ boolean
default n
config ADK_KPACKAGE_KMOD_ISO9660_FS