summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.fsnet2
-rw-r--r--target/linux/config/Config.in.input2
-rw-r--r--target/linux/config/Config.in.netfilter.ip44
3 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 77871f171..c22ae210c 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL
default y
config ADK_KPACKAGE_KMOD_CIFS
- prompt "kmod-fs-cifs...................... CIFS support"
+ prompt "kmod-cifs......................... CIFS support"
tristate
select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
select ADK_KERNEL_NETWORK_FILESYSTEMS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 587a7f2c9..dda525cda 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -152,12 +152,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
tristate
select ADK_KERNEL_INPUT
select ADK_KERNEL_INPUT_KEYBOARD
+ depends on !ADK_KERNEL_KEYBOARD_ATKBD
default n
config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
prompt "kmod-input-mouse................. Mouse support (PS/2)"
tristate
select ADK_KERNEL_INPUT
+ depends on !ADK_KERNEL_INPUT_MOUSEDEV
default n
config ADK_KPACKAGE_KMOD_INPUT_EVDEV
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 77d24ede7..817000d63 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,14 +36,14 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
config ADK_KPACKAGE_KMOD_FULL_NAT
tristate "Meta package for Full NAT"
- select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_60
+ select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_65
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_5
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_4_60
+ depends on ADK_KERNEL_VERSION_3_4_65
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by