[Gc-linux-cvs] linux/sound/ppc gcn-ai.c,1.8,1.9

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

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

Modified Files:
	gcn-ai.c 
Log Message:
Merged 2.6.22.
Updated drivers to use in_be* and out_be* instead of read* and write*
input/output instructions.
Updated DI driver:
- do not use debug extensions with unknown drive models
- do not load custom firmware on xenogc/duoq
- evict alien firmwares and load custom formware on known drive models


Index: gcn-ai.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gcn-ai.c	30 Apr 2007 17:06:13 -0000	1.8
+++ gcn-ai.c	14 Nov 2007 23:08:58 -0000	1.9
@@ -362,7 +362,8 @@
 	strcpy(card->shortname, card->driver);
 	sprintf(card->longname, "Nintendo GameCube Audio Interface");
 
-	if (request_irq(DSP_IRQ, snd_gcn_interrupt, SA_INTERRUPT | SA_SHIRQ, 
+	if (request_irq(DSP_IRQ, snd_gcn_interrupt,
+			IRQF_DISABLED | IRQF_SHARED, 
 			card->shortname,gcn_audio)) {
 		snd_printk(KERN_ERR "%s: unable to grab IRQ %d\n",
 			   card->shortname, DSP_IRQ);