[Gc-linux-cvs] linux/sound/ppc gcn-ai.c, 1.12, 1.13 gcn-mic.c, 1.7, 1.8

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

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

Modified Files:
	gcn-ai.c gcn-mic.c 
Log Message:
Merged 2.6.25.
Queued small fixes for: 
- starlet-es
- starlet-ipc
- starlet-stm
- rvl-stsd
- rvl-sthcd
- gcn-ai



Index: gcn-mic.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-mic.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gcn-mic.c	27 Mar 2008 22:35:48 -0000	1.7
+++ gcn-mic.c	13 Sep 2008 19:42:58 -0000	1.8
@@ -23,7 +23,6 @@
 #include <linux/proc_fs.h>
 #include <linux/exi.h>
 
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #define SNDRV_GET_ID

Index: gcn-ai.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gcn-ai.c	27 Mar 2008 22:35:47 -0000	1.12
+++ gcn-ai.c	13 Sep 2008 19:42:58 -0000	1.13
@@ -21,7 +21,6 @@
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #define SNDRV_GET_ID
@@ -399,7 +398,7 @@
 	ai_disable_interrupts(chip->dsp_base);
 }
 
-static int ai_init(struct snd_gcn *chip,
+static int __devinit ai_init(struct snd_gcn *chip,
 		   struct resource *dsp, struct resource *ai,
 		   unsigned int irq)
 {
@@ -478,7 +477,7 @@
 	return -ENODEV;
 }
 
-static int ai_do_probe(struct device *dev,
+static int __devinit ai_do_probe(struct device *dev,
 		       struct resource *dsp, struct resource *ai,
 		       unsigned int irq)
 {