diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/mips/Config.in | |
parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
parent | 34592482701199604242848b80c39bd07b6c7716 (diff) |
resolve merge conflict
Diffstat (limited to 'target/mips/Config.in')
-rw-r--r-- | target/mips/Config.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/mips/Config.in b/target/mips/Config.in index 90a519f6b..bbae13a6c 100644 --- a/target/mips/Config.in +++ b/target/mips/Config.in @@ -1,5 +1,5 @@ choice -depends on ADK_LINUX_MIPS && ADK_CHOOSE_TARGET_ARCH +depends on ADK_LINUX_MIPS && !ADK_CHOOSE_TARGET_ARCH prompt "Target system" config ADK_CHOOSE_TARGET_SYSTEM_MIPS |