diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
| commit | 4a54d9dd804bc3b64703ba04060ec8c48a8c9811 (patch) | |
| tree | 948f1b2bead3d128603ad5a34609205db61da3aa /target/linux/config/Config.in.network | |
| parent | e61aad237ecb819635bb7550dbbf66f2b8817b50 (diff) | |
| parent | 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/config/Config.in.network')
| -rw-r--r-- | target/linux/config/Config.in.network | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 6e4267857..2ec253111 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -158,7 +158,7 @@ config ADK_KPACKAGE_KMOD_NET_IPGRE config ADK_KPACKAGE_KMOD_IPV6 prompt "kmod-ipv6......................... IPv6 support" tristate - default n + default m help This is complemental support for the IP version 6. You will still be able to do traditional IPv4 networking as well. |