Update of /cvsroot/gc-linux/linux/sound/ppc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/sound/ppc
Modified Files:
Kconfig Makefile
Log Message:
Merge gc-linux-v2.6.30.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile 25 Oct 2009 18:33:48 -0000 1.10
--- Makefile 25 Oct 2009 18:50:28 -0000 1.11
***************
*** 5,10 ****
--- 5,13 ----
snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
+ snd-gcn-objs := gcn-ai.o
# Toplevel Module Dependency
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.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Kconfig 25 Oct 2009 18:45:36 -0000 1.19
--- Kconfig 25 Oct 2009 18:50:28 -0000 1.20
***************
*** 50,52 ****
--- 50,70 ----
default "2000"
+ config SND_GAMECUBE
+ tristate "Nintendo GameCube/Wii"
+ depends on SND && GAMECUBE_COMMON
+ help
+ Say Y here to include support for audio on the Nintendo GameCube/Wii.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-gcn.
+
+ config SND_GAMECUBE_MIC
+ tristate "Nintendo GameCube Microphone (DOL-022)"
+ depends on SND && GAMECUBE_EXI && EXPERIMENTAL
+ help
+ If you say yes to this option, support will be included for the
+ Nintendo GameCube Microphone (DOL-022).
+
+ If in doubt, say N here.
+
endif # SND_PPC
|
