---

yaml --- r: 62083 b: refs/heads/master c: c454fd4 h: refs/heads/master i: 62081: 2fc0f59 62079: 94a2951 v: v3
git-mirror · Jul 20, 2007 · 5d50733 · 5d50733
1 parent a02f91e
commit 5d50733
Show file tree

Hide file tree

Showing 6 changed files with 2,174 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87823090a8bd373f34bdb6f1d5cdc5f2f4da4905
+refs/heads/master: c454fd4e888dc2b1423b6a65106a619e99a2deb4
diff --git a/trunk/sound/ppc/Kconfig b/trunk/sound/ppc/Kconfig
@@ -33,3 +33,23 @@ config SND_POWERMAC_AUTO_DRC
 	  option.
 
 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
diff --git a/trunk/sound/ppc/Makefile b/trunk/sound/ppc/Makefile
@@ -6,4 +6,5 @@
 snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
 
 # Toplevel Module Dependency
-obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
+obj-$(CONFIG_SND_POWERMAC)	+= snd-powermac.o
+obj-$(CONFIG_SND_PS3)		+= snd_ps3.o