diff options
| author | Linus Torvalds | 2012-03-22 17:42:36 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-03-22 17:43:22 +0100 |
| commit | 23904815461ba223a8baf7490051597fa054299b (patch) | |
| tree | 2d52ce8ff18c4f731183d0b10048eb74489a3391 /arch/x86/kernel/apic/summit_32.c | |
| parent | Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | x86/platform: Move APIC ID validity check into platform APIC code (diff) | |
| download | kernel-qcow2-linux-23904815461ba223a8baf7490051597fa054299b.tar.gz kernel-qcow2-linux-23904815461ba223a8baf7490051597fa054299b.tar.xz kernel-qcow2-linux-23904815461ba223a8baf7490051597fa054299b.zip | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar.
Removes the Moorestown platform that nobody ever used.
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform: Move APIC ID validity check into platform APIC code
x86/olpc/xo15/sci: Enable lid close wakeup control
x86/geode/net5501: Add platform driver for Soekris Engineering net5501
x86/geode/alix2: Supplement driver to include GPIO button support
x86/mid/powerbtn: Use MSIC read/write instead of ipc_scu
x86/mid/thermal: Turn off thermistor
x86/mid/thermal: Add msic_thermal alias
x86/mid/thermal: Convert to use Intel MSIC API
x86/mid/scu_ipc: Remove Moorestown support
x86/mid: Kill off Moorestown
x86/mrst: Add msic_thermal platform support
x86/config: Select MSIC MFD driver on Intel Medfield platform
x86/mid: Remove Intel Moorestown
x86/mrst: Set ISA bus type for fake MP IRQs
x86/ioapic: Use legacy_pic to set correct gsi-irq mapping
Diffstat (limited to 'arch/x86/kernel/apic/summit_32.c')
| -rw-r--r-- | arch/x86/kernel/apic/summit_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c index 19114423c58c..fea000b27f07 100644 --- a/arch/x86/kernel/apic/summit_32.c +++ b/arch/x86/kernel/apic/summit_32.c @@ -496,6 +496,7 @@ static struct apic apic_summit = { .name = "summit", .probe = probe_summit, .acpi_madt_oem_check = summit_acpi_madt_oem_check, + .apic_id_valid = default_apic_id_valid, .apic_id_registered = summit_apic_id_registered, .irq_delivery_mode = dest_LowestPrio, |