diff --git a/[refs] b/[refs] index 487cc5ca6e25..0519d21d9003 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6acc7d485c24c00e111c61b2e6dff9180faebcae +refs/heads/master: a4609780c9acd291becfc5e81b08485f92803886 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index f374ccac1917..9541171f1220 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -10,8 +10,6 @@ config MIPS select HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_GRAPH_TRACER - # Horrible source of confusion. Die, die, die ... - select EMBEDDED select RTC_LIB if !MACH_LOONGSON mainmenu "Linux/MIPS Kernel Configuration"