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

[sfrench/cifs-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 295e8c55fb3a6a939093c83d78632da49bfdca71..3ad59dde485209bce858c425e4fc8a2f64b04c09 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -10,6 +10,8 @@ config MIPS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_KPROBES
+       select HAVE_KRETPROBES
        select RTC_LIB if !MACH_LOONGSON
 
 mainmenu "Linux/MIPS Kernel Configuration"
@@ -756,10 +758,6 @@ config GENERIC_CLOCKEVENTS
        bool
        default y
 
-config GENERIC_TIME
-       bool
-       default y
-
 config GENERIC_CMOS_UPDATE
        bool
        default y
@@ -915,6 +913,9 @@ config CPU_LITTLE_ENDIAN
 
 endchoice
 
+config EXPORT_UASM
+       bool
+
 config SYS_SUPPORTS_APM_EMULATION
        bool