From: Michal Marek <mmarek@suse.cz>
Date: Tue, 12 Oct 2010 13:09:06 +0000 (+0200)
Subject: Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=239060b93bb30a4ad55f1ecaa512464a035cc5ba

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

We need to revert the temporary hack in 71ebc01, hence the merge.
---

239060b93bb30a4ad55f1ecaa512464a035cc5ba
diff --cc arch/mips/Kconfig
index 33771676957d,3ad59dde4852..9f617417c0a3
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -10,8 -10,12 +10,10 @@@ config MIP
  	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"
 -
  menu "Machine selection"
  
  config ZONE_DMA