diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-07 10:29:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-07 10:29:58 +0100 |
| commit | 258594a138f4ca9adf214f5272592d7f21def610 (patch) | |
| tree | d97ee71c997b0412f79b9ec4150cb52ce838fe13 /arch/x86/Kconfig | |
| parent | a87d091434ed2a34d647979ab12084139ee1fe41 (diff) | |
| parent | ca3273f9646694e0419cfb9d6c12deb1c9aff27c (diff) | |
| download | blackbird-op-linux-258594a138f4ca9adf214f5272592d7f21def610.tar.gz blackbird-op-linux-258594a138f4ca9adf214f5272592d7f21def610.zip | |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 488a4ecd0b59..1d5550d19b66 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1494,7 +1494,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID def_bool X86_64 depends on NUMA -menu "Power management options" +menu "Power management and ACPI options" depends on !X86_VOYAGER config ARCH_HIBERNATION_HEADER @@ -1894,6 +1894,10 @@ config SYSVIPC_COMPAT endmenu +config HAVE_ATOMIC_IOMAP + def_bool y + depends on X86_32 + source "net/Kconfig" source "drivers/Kconfig" |
