summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/x86_init.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-19 14:43:56 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 17:12:52 +0200
commitf7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc (patch)
tree9ab5f0e8e895681a326dd94cb969c950c03271aa /arch/x86/kernel/x86_init.c
parent57844a8f8e29802f37ad9a0f94eb11d6ae358603 (diff)
downloadlinux-f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc.tar.gz
linux-f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc.tar.bz2
linux-f7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc.zip
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.c4
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) { }
* for standard PC hardware.
*/
struct __initdata x86_init_ops x86_init = {
+
+ .resources = {
+ .probe_roms = x86_init_noop,
+ },
};