From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 23 Aug 2012 21:42:57 +0000 (+0200)
Subject: Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
X-Git-Tag: next-20120824~101^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0e3127c584fd70afc6e937b8241e9609bd7e8052;p=karo-tx-linux.git

Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
---

0e3127c584fd70afc6e937b8241e9609bd7e8052
diff --cc arch/mips/kernel/Makefile
index 74316dcc55ab,ab51dc99c03f..2dbecf843d74
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@@ -32,31 -32,13 +32,14 @@@ obj-$(CONFIG_SYNC_R4K)		+= sync-r4k.
  obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
  obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o
  
 +obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o
  obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o
  
- obj-$(CONFIG_CPU_LOONGSON2)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_MIPS32)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_MIPS64)	+= r4k_fpu.o r4k_switch.o
+ obj-$(CONFIG_CPU_R4K_FPU)	+= r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R3000)		+= r2300_fpu.o r2300_switch.o
- obj-$(CONFIG_CPU_R4300)		+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R4X00)		+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R5000)		+= r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R6000)		+= r6000_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R5432)		+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R5500)		+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R8000)		+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_RM7000)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_RM9000)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_NEVADA)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R10000)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_SB1)		+= r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_TX39XX)	+= r2300_fpu.o r2300_switch.o
- obj-$(CONFIG_CPU_TX49XX)	+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_VR41XX)	+= r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= octeon_switch.o
- obj-$(CONFIG_CPU_XLR)		+= r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_XLP)		+= r4k_fpu.o r4k_switch.o
  
  obj-$(CONFIG_SMP)		+= smp.o
  obj-$(CONFIG_SMP_UP)		+= smp-up.o