[Gc-linux-cvs] linux/sound/ppc Kconfig, 1.24, 1.25 Makefile, 1.14, 1.15

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

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/sound/ppc

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.32.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	9 Dec 2009 18:18:07 -0000	1.14
--- Makefile	9 Dec 2009 18:44:56 -0000	1.15
***************
*** 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.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Kconfig	9 Dec 2009 18:40:10 -0000	1.24
--- Kconfig	9 Dec 2009 18:44:56 -0000	1.25
***************
*** 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