diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-01 13:02:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-01 13:02:50 -0400 |
| commit | 4420471f14b79f2a42e4603be7794ea49b68bca4 (patch) | |
| tree | d391d25458bc0aa86dcf2823fd6c1464883b0533 /arch/x86/Kconfig | |
| parent | 15e957d08dd4a841359cfec59ecb74041e0097aa (diff) | |
| parent | e0e42142bab96404de535cceb85d6533d5ad7942 (diff) | |
Merge branch 'x86/apic' into irq/numa
Conflicts:
arch/x86/kernel/apic/io_apic.c
Merge reason: non-trivial interaction between ongoing work in io_apic.c
and the NUMA migration feature in the irq tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 674e21e9f0a0..e03485b2828a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -349,7 +349,7 @@ config X86_UV | |||
| 349 | depends on X86_64 | 349 | depends on X86_64 |
| 350 | depends on X86_EXTENDED_PLATFORM | 350 | depends on X86_EXTENDED_PLATFORM |
| 351 | depends on NUMA | 351 | depends on NUMA |
| 352 | select X86_X2APIC | 352 | depends on X86_X2APIC |
| 353 | ---help--- | 353 | ---help--- |
| 354 | This option is needed in order to support SGI Ultraviolet systems. | 354 | This option is needed in order to support SGI Ultraviolet systems. |
| 355 | If you don't have one of these, you should say N here. | 355 | If you don't have one of these, you should say N here. |