diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /target | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/config/Config.in.netfilter | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index ce6e80f15..94f82ef64 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -146,7 +146,6 @@ source target/linux/config/Config.in.netfilter.ip4 endmenu menu "IPv6: Netfilter Configuration" - depends on ADK_ENABLE_IPV6 source target/linux/config/Config.in.netfilter.ip6 endmenu |