[Gc-linux-cvs] linux/sound/ppc Kconfig,1.12,1.13 Makefile,1.6,1.7

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/sound/ppc

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.23.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	17 Feb 2007 23:43:42 -0000	1.6
+++ Makefile	16 Nov 2007 23:26:09 -0000	1.7
@@ -7,6 +7,8 @@
 snd-gcn-objs := gcn-ai.o
 
 # Toplevel Module Dependency
-obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
-obj-$(CONFIG_SND_GAMECUBE) += snd-gcn.o
-obj-$(CONFIG_SND_GAMECUBE_MIC) += gcn-mic.o
+obj-$(CONFIG_SND_POWERMAC)	+= snd-powermac.o
+obj-$(CONFIG_SND_PS3)		+= snd_ps3.o
+obj-$(CONFIG_SND_GAMECUBE)	+= snd-gcn.o
+obj-$(CONFIG_SND_GAMECUBE_MIC)	+= gcn-mic.o
+

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Kconfig	17 May 2006 22:14:40 -0000	1.12
+++ Kconfig	16 Nov 2007 23:26:09 -0000	1.13
@@ -53,3 +53,23 @@
 	  If in doubt, say N here.
 
 endmenu
+
+menu "ALSA PowerPC devices"
+	depends on SND!=n && ( PPC64 || PPC32 )
+
+config SND_PS3
+	tristate "PS3 Audio support"
+	depends on SND && PS3_PS3AV
+	select SND_PCM
+	default m
+	help
+	  Say Y here to include support for audio on the PS3
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called snd_ps3.
+
+config SND_PS3_DEFAULT_START_DELAY
+	int "Startup delay time in ms"
+	depends on SND_PS3
+	default "2000"
+endmenu