From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 13 Dec 2012 18:40:13 +0000 (+0100)
Subject: Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for... 
X-Git-Tag: firefly_0821_release~3680^2~1450^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=241738bd51cb0efe58e6c570223153e970afe3ae;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mips-next' of dev.phrozen.org/githttp/mips-next into mips-for-linux-next
---

241738bd51cb0efe58e6c570223153e970afe3ae
diff --cc arch/mips/Kconfig
index 9806a5ae50be,1f495eb077d8..b7dc39c6c849
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -114,8 -113,8 +115,7 @@@ config BCM47X
  	select IRQ_CPU
  	select SYS_SUPPORTS_32BIT_KERNEL
  	select SYS_SUPPORTS_LITTLE_ENDIAN
- 	select GENERIC_GPIO
  	select SYS_HAS_EARLY_PRINTK
 -	select CFE
  	help
  	 Support for BCM47XX based boards
  
diff --cc arch/mips/oprofile/Makefile
index 8232dbd1228d,65f5237ec821..9c0a6782c091
--- a/arch/mips/oprofile/Makefile
+++ b/arch/mips/oprofile/Makefile
@@@ -12,4 -12,6 +12,5 @@@ oprofile-$(CONFIG_CPU_MIPS32)		+= op_mo
  oprofile-$(CONFIG_CPU_MIPS64)		+= op_model_mipsxx.o
  oprofile-$(CONFIG_CPU_R10000)		+= op_model_mipsxx.o
  oprofile-$(CONFIG_CPU_SB1)		+= op_model_mipsxx.o
+ oprofile-$(CONFIG_CPU_XLR)		+= op_model_mipsxx.o
 -oprofile-$(CONFIG_CPU_RM9000)		+= op_model_rm9000.o
  oprofile-$(CONFIG_CPU_LOONGSON2)	+= op_model_loongson2.o