diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:30:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:30:19 +0200 |
| commit | 10d3285d0b3af641ee446f0be8f0a7f40cb515b6 (patch) | |
| tree | 836ad323a1eae8a4bdd5ab5f5e4271efeb85cf8c /arch/x86/Kconfig | |
| parent | 6dec3a10a7a6093af10cef7ac56021150afd6451 (diff) | |
| parent | 3a61ec387c9092dfc91a5959145d36835a72fc4c (diff) | |
| download | linux-10d3285d0b3af641ee446f0be8f0a7f40cb515b6.tar.gz linux-10d3285d0b3af641ee446f0be8f0a7f40cb515b6.tar.bz2 linux-10d3285d0b3af641ee446f0be8f0a7f40cb515b6.zip | |
Merge branch 'x86/urgent' into x86/core
Conflicts:
include/asm-x86/gpio.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4d621eb90bbf..97e97ee96628 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -23,7 +23,7 @@ config X86 select HAVE_OPROFILE select HAVE_IOREMAP_PROT select HAVE_KPROBES - select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X + select ARCH_WANT_OPTIONAL_GPIOLIB select HAVE_KRETPROBES select HAVE_DYNAMIC_FTRACE select HAVE_FTRACE @@ -332,20 +332,6 @@ config X86_BIGSMP endif -config X86_RDC321X - bool "RDC R-321x SoC" - depends on X86_32 - select M486 - select X86_REBOOTFIXUPS - select GENERIC_GPIO - select LEDS_CLASS - select LEDS_GPIO - select NEW_LEDS - help - This option is needed for RDC R-321x system-on-chip, also known - as R-8610-(G). - If you don't have one of these chips, you should say N here. - config X86_VSMP bool "Support for ScaleMP vSMP" select PARAVIRT @@ -369,6 +355,16 @@ config X86_VISWS A kernel compiled for the Visual Workstation will run on general PCs as well. See <file:Documentation/sgi-visws.txt> for details. +config X86_RDC321X + bool "RDC R-321x SoC" + depends on X86_32 + select M486 + select X86_REBOOTFIXUPS + help + This option is needed for RDC R-321x system-on-chip, also known + as R-8610-(G). + If you don't have one of these chips, you should say N here. + config SCHED_NO_NO_OMIT_FRAME_POINTER def_bool y prompt "Single-depth WCHAN output" |