diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /arch/x86/Kconfig | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
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 d03e91762f61..27b8a3a39911 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1495,7 +1495,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID | |||
| 1495 | def_bool X86_64 | 1495 | def_bool X86_64 |
| 1496 | depends on NUMA | 1496 | depends on NUMA |
| 1497 | 1497 | ||
| 1498 | menu "Power management options" | 1498 | menu "Power management and ACPI options" |
| 1499 | depends on !X86_VOYAGER | 1499 | depends on !X86_VOYAGER |
| 1500 | 1500 | ||
| 1501 | config ARCH_HIBERNATION_HEADER | 1501 | config ARCH_HIBERNATION_HEADER |