Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5892d549596d602ed4512c606b9d5a72dc0f483e..7bb15747fea251ff5470085ed454655398f9d60f 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -164,10 +164,6 @@ config INSTRUCTION_DECODER
        def_bool y
        depends on KPROBES || PERF_EVENTS || UPROBES
 
-config PERF_EVENTS_INTEL_UNCORE
-       def_bool y
-       depends on PERF_EVENTS && CPU_SUP_INTEL && PCI
-
 config OUTPUT_FORMAT
        string
        default "elf32-i386" if X86_32
@@ -1046,6 +1042,8 @@ config X86_THERMAL_VECTOR
        def_bool y
        depends on X86_MCE_INTEL
 
+source "arch/x86/events/Kconfig"
+
 config X86_LEGACY_VM86
        bool "Legacy VM86 support"
        default n
@@ -1210,15 +1208,6 @@ config MICROCODE_OLD_INTERFACE
        def_bool y
        depends on MICROCODE
 
-config PERF_EVENTS_AMD_POWER
-       depends on PERF_EVENTS && CPU_SUP_AMD
-       tristate "AMD Processor Power Reporting Mechanism"
-       ---help---
-         Provide power reporting mechanism support for AMD processors.
-         Currently, it leverages X86_FEATURE_ACC_POWER
-         (CPUID Fn8000_0007_EDX[12]) interface to calculate the
-         average power consumption on Family 15h processors.
-
 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
        ---help---