aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-20 07:54:56 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:59 -0400
commit9e0a2de2684372f16130b753efdbf226a997efb0 (patch)
tree4502723a25bb3656a028bde2de425f090db3bc83
parent643befed1090af5f0000297ce11fa23e2777f42b (diff)
x86: rearrange bus_type parse
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/mpparse_32.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index c13092db578e..13adcc40a00e 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -242,16 +242,16 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
242#endif 242#endif
243 243
244 set_bit(m->mpc_busid, mp_bus_not_pci); 244 set_bit(m->mpc_busid, mp_bus_not_pci);
245 if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) { 245 if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) {
246 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA;
247 } else if (strncmp(str, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) {
248 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_EISA;
249 } else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) {
250 mpc_oem_pci_bus(m, translation_table[mpc_record]); 246 mpc_oem_pci_bus(m, translation_table[mpc_record]);
251 clear_bit(m->mpc_busid, mp_bus_not_pci); 247 clear_bit(m->mpc_busid, mp_bus_not_pci);
252 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI; 248 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI;
253 mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id; 249 mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id;
254 mp_current_pci_id++; 250 mp_current_pci_id++;
251 } else if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) {
252 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA;
253 } else if (strncmp(str, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) {
254 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_EISA;
255 } else if (strncmp(str, BUSTYPE_MCA, sizeof(BUSTYPE_MCA)-1) == 0) { 255 } else if (strncmp(str, BUSTYPE_MCA, sizeof(BUSTYPE_MCA)-1) == 0) {
256 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_MCA; 256 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_MCA;
257 } else { 257 } else {