diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/mips/kernel/lemote-yeelong | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/mips/kernel/lemote-yeelong')
| -rw-r--r-- | target/mips/kernel/lemote-yeelong | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong index 412f6f9f8..96ca64c66 100644 --- a/target/mips/kernel/lemote-yeelong +++ b/target/mips/kernel/lemote-yeelong @@ -6,14 +6,11 @@ CONFIG_CPU_LOONGSON2F=y CONFIG_CPU_NOP_WORKAROUNDS=y CONFIG_CPU_JUMP_WORKAROUNDS=y CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y -CONFIG_64BIT=y CONFIG_PAGE_SIZE_16KB=y CONFIG_MIPS32_COMPAT=y CONFIG_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_8139TOO=y CONFIG_SERIO=y CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=y |