[Gc-linux-cvs] linux/sound/ppc Kconfig,1.2,1.3 gamecube.c,1.3,1.4

[<aot...@us...>]

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

Modified Files:
	Kconfig gamecube.c 
Log Message:
Merged 2.6.5

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	13 Mar 2004 19:58:23 -0000	1.2
+++ Kconfig	24 Apr 2004 18:31:45 -0000	1.3
@@ -6,6 +6,7 @@
 config SND_POWERMAC
 	tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
 	depends on SND
+	select SND_PCM
 
 config SND_GAMECUBE
 	tristate "GameCube audio"

Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gamecube.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gamecube.c	7 Mar 2004 03:02:09 -0000	1.3
+++ gamecube.c	24 Apr 2004 18:31:45 -0000	1.4
@@ -274,7 +274,9 @@
 	/* snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_gamecube_capture_ops); */
 	
 	/* preallocate 64k buffer */
-	snd_pcm_lib_preallocate_pages_for_all(pcm, 64 * 1024, 64 * 1024, GFP_KERNEL);
+	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
+			snd_dma_continuous_data(GFP_KERNEL),
+			64 * 1024, 64 * 1024);
 
 	pcm->info_flags = 0;
 	pcm->private_data = chip;