Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / probe_roms_32.c

diff --git a/arch/x86/kernel/probe_roms_32.c b/arch/x86/kernel/probe_roms_32.c
index 675a48c404a5abde75e35a655ea8ed56b938bc89..071e7fea42e5b3fd07bb16a7a953f4d4145f9110 100644 (file)
--- a/arch/x86/kernel/probe_roms_32.c
+++ b/arch/x86/kernel/probe_roms_32.c
@@ -18,7 +18,7 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/io.h>
-#include <setup_arch.h>
+#include <asm/setup_arch.h>
 
 static struct resource system_rom_resource = {
        .name   = "System ROM",