[Gc-linux-cvs] linux/sound/ppc Kconfig, 1.21, 1.22 Makefile, 1.12, 1.13 gcn-ai.c, 1.14, 1.15 gcn-mic.c, 1.9, 1.10

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

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/sound/ppc

Modified Files:
	Kconfig Makefile gcn-ai.c gcn-mic.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: gcn-mic.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-mic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gcn-mic.c	1 Feb 2009 18:29:35 -0000	1.9
--- gcn-mic.c	25 Oct 2009 18:59:28 -0000	1.10
***************
*** 613,618 ****
  DBG("enter\n");
  
! 	card = snd_card_new(index, id, THIS_MODULE, 0);
! 	if (!card) {
  		mic_printk(KERN_ERR, "unable to create sound card\n");
  		goto err_card;
--- 613,618 ----
  DBG("enter\n");
  
! 	retval = snd_card_create(index, id, THIS_MODULE, 0, &card);
! 	if (retval < 0) {
  		mic_printk(KERN_ERR, "unable to create sound card\n");
  		goto err_card;

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	25 Oct 2009 18:53:46 -0000	1.12
--- Makefile	25 Oct 2009 18:59:28 -0000	1.13
***************
*** 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: gcn-ai.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gcn-ai.c	1 Feb 2009 18:29:35 -0000	1.14
--- gcn-ai.c	25 Oct 2009 18:59:28 -0000	1.15
***************
*** 486,491 ****
  	int retval;
  
! 	card = snd_card_new(index, id, THIS_MODULE, sizeof(struct snd_gcn));
! 	if (!card) {
  		drv_printk(KERN_ERR, "failed to allocate card\n");
  		return -ENOMEM;
--- 486,491 ----
  	int retval;
  
! 	retval = snd_card_create(index, id, THIS_MODULE, sizeof(struct snd_gcn), &card);
! 	if (retval < 0) {
  		drv_printk(KERN_ERR, "failed to allocate card\n");
  		return -ENOMEM;

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Kconfig	25 Oct 2009 18:53:46 -0000	1.21
--- Kconfig	25 Oct 2009 18:59:28 -0000	1.22
***************
*** 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