diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 08:43:56 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 11:12:52 -0400 |
commit | f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc (patch) | |
tree | 9ab5f0e8e895681a326dd94cb969c950c03271aa /arch/x86/kernel/x86_init.c | |
parent | 57844a8f8e29802f37ad9a0f94eb11d6ae358603 (diff) |
x86: Add probe_roms to x86_init
probe_roms is only used on 32bit. Add it to the x86_init ops and
remove the #ifdefs.
Default initializer is x86_init_noop() which is overridden in
the 32bit boot code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/x86_init.c')
-rw-r--r-- | arch/x86/kernel/x86_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index 82d510c9c996..88883f8006c2 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c | |||
@@ -14,4 +14,8 @@ void __cpuinit x86_init_noop(void) { } | |||
14 | * for standard PC hardware. | 14 | * for standard PC hardware. |
15 | */ | 15 | */ |
16 | struct __initdata x86_init_ops x86_init = { | 16 | struct __initdata x86_init_ops x86_init = { |
17 | |||
18 | .resources = { | ||
19 | .probe_roms = x86_init_noop, | ||
20 | }, | ||
17 | }; | 21 | }; |