diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
| commit | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (patch) | |
| tree | 8d0d6a6026aa6c0a7b5bbd777ef9ed65f916fa78 /target | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netfilter | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index b8fab0255..7dd6c1947 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -275,6 +275,7 @@ config ADK_TARGET_SUFFIX default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI + default "gnu" choice prompt "Target firmware type" 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 |