aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/mpparse.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 06:45:33 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 11:12:52 -0400
commit52fdb5684660f9fd7129f7bbbe279a02893bacb8 (patch)
treec1b8e93f0ead1708f3634be1dd53b4675ee271cc /arch/x86/kernel/mpparse.c
parent72302142e165313ee58af81bd76708c12b58d7ab (diff)
x86: Move mpc_oem_pci_bus to x86_init_ops
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r--arch/x86/kernel/mpparse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 45abdf63edcd..72e1140723cf 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -98,8 +98,8 @@ static void __init MP_bus_info(struct mpc_bus *m)
98 mp_bus_id_to_type[m->busid] = MP_BUS_ISA; 98 mp_bus_id_to_type[m->busid] = MP_BUS_ISA;
99#endif 99#endif
100 } else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI) - 1) == 0) { 100 } else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI) - 1) == 0) {
101 if (x86_quirks->mpc_oem_pci_bus) 101 if (x86_init.mpparse.mpc_oem_pci_bus)
102 x86_quirks->mpc_oem_pci_bus(m); 102 x86_init.mpparse.mpc_oem_pci_bus(m);
103 103
104 clear_bit(m->busid, mp_bus_not_pci); 104 clear_bit(m->busid, mp_bus_not_pci);
105#if defined(CONFIG_EISA) || defined(CONFIG_MCA) 105#if defined(CONFIG_EISA) || defined(CONFIG_MCA)