From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 30 Nov 2012 16:34:25 +0000 (+0100)
Subject: Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for... 
X-Git-Tag: next-20121205~121^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbb3876de77cd31739fbca01bd82a1bc56e2ed5e;p=karo-tx-linux.git

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

fbb3876de77cd31739fbca01bd82a1bc56e2ed5e
diff --cc arch/mips/Kconfig
index a94050c1e5a4,1f495eb077d8..07440d7458db
--- 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