From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/x86_64/kernel/qemu-x86_64 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'target/x86_64') diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index baad58c81..612bdbcb5 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -1,5 +1,6 @@ CONFIG_X86=y CONFIG_X86_64=y +CONFIG_X86_X32=y CONFIG_GENERIC_CPU=y CONFIG_PROCESSOR_SELECT=y CONFIG_CPU_SUP_INTEL=y @@ -7,19 +8,8 @@ CONFIG_CPU_SUP_AMD=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_MTRR=y -CONFIG_X86_PAT=y -CONFIG_PCI=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_MSI=y -CONFIG_PCI_LABEL=y -CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_IA32_EMULATION=y -CONFIG_X86_X32=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -- cgit v1.2.3