6 files changed, 12 insertions, 12 deletions
diff --git a/src/cpu/emulation/qemu-i386/chip.h b/src/cpu/emulation/qemu-i386/chip.h
deleted file mode 100644
index 6ade17bb01..0000000000
--- a/src/cpu/emulation/qemu-i386/chip.h
+++ /dev/null
@@ -1,6 +0,0 @@
-struct cpu_emulation_qemu_i386_config
-{
-};
-
-extern struct chip_operations cpu_emulation_qemu_i386_ops;
-
diff --git a/src/cpu/emulation/qemu-i386/northbridge.h b/src/cpu/emulation/qemu-i386/northbridge.h
deleted file mode 100644
index c74e63b97d..0000000000
--- a/src/cpu/emulation/qemu-i386/northbridge.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef NORTHBRIDGE_EMULATION_QEMU_I386_H
-#define NORTHBRIDGE_EMULATION_QEMU_I386_H
-
-
-#endif /* NORTHBRIDGE_EMULATION_QEMU_I386 */
diff --git a/src/cpu/emulation/qemu-i386/Config.lb b/src/cpu/emulation/qemu-x86/Config.lb
index 4a0c2c8658..4a0c2c8658 100644
--- a/src/cpu/emulation/qemu-i386/Config.lb
+++ b/src/cpu/emulation/qemu-x86/Config.lb
diff --git a/src/cpu/emulation/qemu-x86/chip.h b/src/cpu/emulation/qemu-x86/chip.h
new file mode 100644
index 0000000000..1183200ff7
--- /dev/null
+++ b/src/cpu/emulation/qemu-x86/chip.h
@@ -0,0 +1,6 @@
+struct cpu_emulation_qemu_x86_config
+{
+};
+
+extern struct chip_operations cpu_emulation_qemu_x86_ops;
+
diff --git a/src/cpu/emulation/qemu-i386/northbridge.c b/src/cpu/emulation/qemu-x86/northbridge.c
index 505511ac95..694df64ec6 100644
--- a/src/cpu/emulation/qemu-i386/northbridge.c
+++ b/src/cpu/emulation/qemu-x86/northbridge.c
@@ -138,7 +138,7 @@ static void enable_dev(struct device *dev)
 	}
 }
 
-struct chip_operations cpu_emulation_qemu_i386_ops = {
+struct chip_operations cpu_emulation_qemu_x86_ops = {
 	CHIP_NAME("QEMU Northbridge")
 	.enable_dev = enable_dev,
 };
diff --git a/src/cpu/emulation/qemu-x86/northbridge.h b/src/cpu/emulation/qemu-x86/northbridge.h
new file mode 100644
index 0000000000..9ff688be2f
--- /dev/null
+++ b/src/cpu/emulation/qemu-x86/northbridge.h
@@ -0,0 +1,5 @@
+#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H
+#define NORTHBRIDGE_EMULATION_QEMU_X86_H
+
+
+#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */