diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/x86/sys-available/qemu-i686 | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/sys-available/qemu-i686')
| -rw-r--r-- | target/x86/sys-available/qemu-i686 | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686 deleted file mode 100644 index b2951a1e2..000000000 --- a/target/x86/sys-available/qemu-i686 +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_I686 - bool "Qemu Emulator (i686)" - select ADK_x86 - select ADK_qemu_i686 - select ADK_CPU_I686 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_BZIMAGE - help - Support for Qemu Emulator (i686). - |