diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 22:00:55 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 22:01:01 +0300 |
| commit | cb4cfd568c1181501419b89d916e8523107c0106 (patch) | |
| tree | 9916f66509a29ed0f211cb2b6103ff1e76424c19 /arch/x86/Kconfig | |
| parent | 939d578ecc62b07efeb186576ab190fe0b766501 (diff) | |
| parent | abb0052289e58140d933b29491f59e4be0a19727 (diff) | |
| download | linux-cb4cfd568c1181501419b89d916e8523107c0106.tar.xz | |
Merge branch 'x86/apic' into x86/platform
Reason: Devicetree based ioapic setup depends on the apic changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4f3d3d432bad..efbae0c7521f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -811,7 +811,7 @@ config X86_LOCAL_APIC config X86_IO_APIC def_bool y - depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC + depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC config X86_VISWS_APIC def_bool y |