aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 16:25:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 16:25:05 -0400
commitfb3b80614438f8b73b3879a19350439d6aa402da (patch)
tree8397dc4dd85b3ecc8d3cb3f56d143843a6346b8c /arch/x86/Kconfig
parent7f268a2ba7c884a239713696238dd4207a57dd9a (diff)
parent3a61ec387c9092dfc91a5959145d36835a72fc4c (diff)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, AMD IOMMU: include amd_iommu_last_bdf in device initialization x86: fix IBM Summit based systems' phys_cpu_present_map on 32-bit kernels x86, RDC321x: remove gpio.h complications x86, RDC321x: add to mach-default crashdump: fix undefined reference to `elfcorehdr_addr' flag parameters: fix compile error of sys_epoll_create1
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig26
1 files changed, 11 insertions, 15 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6bdde845818e..b6fa2877b173 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -24,7 +24,7 @@ config X86
24 select HAVE_IOREMAP_PROT 24 select HAVE_IOREMAP_PROT
25 select HAVE_GET_USER_PAGES_FAST 25 select HAVE_GET_USER_PAGES_FAST
26 select HAVE_KPROBES 26 select HAVE_KPROBES
27 select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X 27 select ARCH_WANT_OPTIONAL_GPIOLIB
28 select HAVE_KRETPROBES 28 select HAVE_KRETPROBES
29 select HAVE_DYNAMIC_FTRACE 29 select HAVE_DYNAMIC_FTRACE
30 select HAVE_FTRACE 30 select HAVE_FTRACE
@@ -333,20 +333,6 @@ config X86_BIGSMP
333 333
334endif 334endif
335 335
336config X86_RDC321X
337 bool "RDC R-321x SoC"
338 depends on X86_32
339 select M486
340 select X86_REBOOTFIXUPS
341 select GENERIC_GPIO
342 select LEDS_CLASS
343 select LEDS_GPIO
344 select NEW_LEDS
345 help
346 This option is needed for RDC R-321x system-on-chip, also known
347 as R-8610-(G).
348 If you don't have one of these chips, you should say N here.
349
350config X86_VSMP 336config X86_VSMP
351 bool "Support for ScaleMP vSMP" 337 bool "Support for ScaleMP vSMP"
352 select PARAVIRT 338 select PARAVIRT
@@ -370,6 +356,16 @@ config X86_VISWS
370 A kernel compiled for the Visual Workstation will run on general 356 A kernel compiled for the Visual Workstation will run on general
371 PCs as well. See <file:Documentation/sgi-visws.txt> for details. 357 PCs as well. See <file:Documentation/sgi-visws.txt> for details.
372 358
359config X86_RDC321X
360 bool "RDC R-321x SoC"
361 depends on X86_32
362 select M486
363 select X86_REBOOTFIXUPS
364 help
365 This option is needed for RDC R-321x system-on-chip, also known
366 as R-8610-(G).
367 If you don't have one of these chips, you should say N here.
368
373config SCHED_NO_NO_OMIT_FRAME_POINTER 369config SCHED_NO_NO_OMIT_FRAME_POINTER
374 def_bool y 370 def_bool y
375 prompt "Single-depth WCHAN output" 371 prompt "Single-depth WCHAN output"