diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-02 14:24:44 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-02 14:24:44 -0500 |
| commit | bd1d462e13b278fc57752d0b9b15040e60e561a0 (patch) | |
| tree | e2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8 /arch/x86/Kconfig | |
| parent | d5c38b137ac8a6e3dbed13bc494d60df5b69dfc4 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
Merge 3.3-rc2 into the driver-core-next branch.
This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6baa1e66e1bc..6339aa496c4f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -363,7 +363,6 @@ config X86_NUMACHIP | |||
| 363 | depends on NUMA | 363 | depends on NUMA |
| 364 | depends on SMP | 364 | depends on SMP |
| 365 | depends on X86_X2APIC | 365 | depends on X86_X2APIC |
| 366 | depends on !EDAC_AMD64 | ||
| 367 | ---help--- | 366 | ---help--- |
| 368 | Adds support for Numascale NumaChip large-SMP systems. Needed to | 367 | Adds support for Numascale NumaChip large-SMP systems. Needed to |
| 369 | enable more than ~168 cores. | 368 | enable more than ~168 cores. |