Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6c30b9e93d8c2540ad6b513426c26d0aa2b982fc..4742ddff464fb9e1285909e987ca1a47e04b7661 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -52,6 +52,7 @@ config X86
        select HAVE_HW_BREAKPOINT
        select HAVE_MIXED_BREAKPOINTS_REGS
        select PERF_EVENTS
+       select HAVE_PERF_EVENTS_NMI
        select ANON_INODES
        select HAVE_ARCH_KMEMCHECK
        select HAVE_USER_RETURN_NOTIFIER
@@ -69,9 +70,6 @@ config ARCH_DEFCONFIG
        default "arch/x86/configs/i386_defconfig" if X86_32
        default "arch/x86/configs/x86_64_defconfig" if X86_64
 
-config GENERIC_TIME
-       def_bool y
-
 config GENERIC_CMOS_UPDATE
        def_bool y
 
@@ -2043,7 +2041,7 @@ config SCx200
 
 config SCx200HR_TIMER
        tristate "NatSemi SCx200 27MHz High-Resolution Timer Support"
-       depends on SCx200 && GENERIC_TIME
+       depends on SCx200
        default y
        ---help---
          This driver provides a clocksource built upon the on-chip
@@ -2059,6 +2057,15 @@ config OLPC
          Add support for detecting the unique features of the OLPC
          XO hardware.
 
+config OLPC_OPENFIRMWARE
+       bool "Support for OLPC's Open Firmware"
+       depends on !X86_64 && !X86_PAE
+       default y if OLPC
+       help
+         This option adds support for the implementation of Open Firmware
+         that is used on the OLPC XO-1 Children's Machine.
+         If unsure, say N here.
+
 endif # X86_32
 
 config K8_NB