aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-19 08:43:56 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 11:12:52 -0400
commitf7cf5a5b8c0e59eac8d30b62271cb0fa52e53ebc (patch)
tree9ab5f0e8e895681a326dd94cb969c950c03271aa /arch/x86/kernel/setup.c
parent57844a8f8e29802f37ad9a0f94eb11d6ae358603 (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/setup.c')
-rw-r--r--arch/x86/kernel/setup.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 63f32d220ef2..5796eb158d49 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -835,9 +835,7 @@ void __init setup_arch(char **cmdline_p)
835 */ 835 */
836 init_hypervisor(&boot_cpu_data); 836 init_hypervisor(&boot_cpu_data);
837 837
838#ifdef CONFIG_X86_32 838 x86_init.resources.probe_roms();
839 probe_roms();
840#endif
841 839
842 /* after parse_early_param, so could debug it */ 840 /* after parse_early_param, so could debug it */
843 insert_resource(&iomem_resource, &code_resource); 841 insert_resource(&iomem_resource, &code_resource);