diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 13:05:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 13:05:57 +0100 |
commit | d040c1614c24162adc3fe106b182596999264e26 (patch) | |
tree | 5af02052e633bcde0e33f77cac52ab4685ad07f1 /arch/x86/kernel/probe_roms_32.c | |
parent | d88316c243e5458a1888edbe0353c4dec6e61c73 (diff) | |
parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) |
Merge branch 'x86/core' into x86/headers
Diffstat (limited to 'arch/x86/kernel/probe_roms_32.c')
-rw-r--r-- | arch/x86/kernel/probe_roms_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/probe_roms_32.c b/arch/x86/kernel/probe_roms_32.c index 675a48c404a..071e7fea42e 100644 --- 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", |