diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-22 09:22:58 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-22 09:22:58 -0800 |
| commit | 53bf82ce766b17436a6e9c672f9fa29702f3731e (patch) | |
| tree | 50547bbc8d5c9f9156f1220b712a99e48dbaf43f /arch/x86/kernel/mpparse.c | |
| parent | 5e8d3183bb605a937fc89b857691f75682aa099e (diff) | |
| parent | 4a4de1d9b47156525ceb46c7faf6ae4042d90aa7 (diff) | |
Merge branch 'omap/fixes-hwmod' into next/fixes-non-critical
* omap/fixes-hwmod: (359 commits)
ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot
ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
ARM: OMAP: rx51: fix USB
ARM: OMAP: mcbsp: Fix possible memory corruption
...
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 9103b89c145a..0741b062a304 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -95,8 +95,8 @@ static void __init MP_bus_info(struct mpc_bus *m) } #endif + set_bit(m->busid, mp_bus_not_pci); if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA) - 1) == 0) { - set_bit(m->busid, mp_bus_not_pci); #if defined(CONFIG_EISA) || defined(CONFIG_MCA) mp_bus_id_to_type[m->busid] = MP_BUS_ISA; #endif |