---

yaml --- r: 190425 b: refs/heads/master c: e97e712 h: refs/heads/master i: 190423: dfc4f33 v: v3
git-mirror · Apr 30, 2010 · 86e79e5 · 86e79e5
1 parent 3091236
commit 86e79e5
Show file tree

Hide file tree

Showing 104 changed files with 1,897 additions and 1,122 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bf729c0af67897ea8498ce17c29b0683f7f2028
+refs/heads/master: e97e7120eb24800cf8eb62c7da07b161cc2a8c73
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -4482,17 +4482,17 @@ S:	Maintained
 F:	drivers/ata/sata_promise.*
 
 PS3 NETWORK SUPPORT
-M:	Geoff Levand <geoffrey.levand@am.sony.com>
+M:	Geoff Levand <geoff@infradead.org>
 L:	netdev@vger.kernel.org
 L:	cbe-oss-dev@ozlabs.org
-S:	Supported
+S:	Maintained
 F:	drivers/net/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
-M:	Geoff Levand <geoffrey.levand@am.sony.com>
+M:	Geoff Levand <geoff@infradead.org>
 L:	linuxppc-dev@ozlabs.org
 L:	cbe-oss-dev@ozlabs.org
-S:	Supported
+S:	Maintained
 F:	arch/powerpc/boot/ps3*
 F:	arch/powerpc/include/asm/lv1call.h
 F:	arch/powerpc/include/asm/ps3*.h

diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -253,6 +253,7 @@ config ARCH_REALVIEW
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select GPIO_PL061 if GPIOLIB
 	help
 	  This enables support for ARM Ltd RealView boards.