diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 10:25:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 10:25:20 +0200 |
| commit | 76c1916cac0994987d1dfefca57e98ddd1f48129 (patch) | |
| tree | 5a005de0225d02568ccc649d9a0bb1b1f294efe3 /target/linux/config | |
| parent | 6e2120ea29a30b1379ee9454ab410088fac0e8f7 (diff) | |
update to latest 3.4 kernel
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.fsnet | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 4 |
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 f8394ddd7..6cb9ef501 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -36,13 +36,13 @@ 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 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 |