[alsa-cvslog] CVS: alsa-kernel/pci/au88x0 au8820.c,1.1,1.2 au8830.c,1.1,1.2 au88x0.h,1.4,1.5 au88x0_synth.c,1.2,1.3

[Jaroslav Kysela]

Update of /cvsroot/alsa/alsa-kernel/pci/au88x0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19107/pci/au88x0

Modified Files:
        au8820.c au8830.c au88x0.h au88x0_synth.c 
Log Message:
2.6 kernel sync

Index: au8820.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au8820.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8820.c    9 Mar 2004 11:52:13 -0000       1.1
+++ au8820.c    24 Apr 2004 14:57:33 -0000      1.2
@@ -1,7 +1,7 @@
 #include "au8820.h"
 #include "au88x0.h"
 static struct pci_device_id snd_vortex_ids[] = {
-       {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX,
+       {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
        {0,}
 };

Index: au8830.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au8830.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au8830.c    9 Mar 2004 11:52:13 -0000       1.1
+++ au8830.c    24 Apr 2004 14:57:33 -0000      1.2
@@ -1,7 +1,7 @@
 #include "au8830.h"
 #include "au88x0.h"
 static struct pci_device_id snd_vortex_ids[] = {
-       {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX2,
+       {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
        {0,}
 };

Index: au88x0.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au88x0.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- au88x0.h    13 Apr 2004 15:26:27 -0000      1.4
+++ au88x0.h    24 Apr 2004 14:57:33 -0000      1.5
@@ -83,7 +83,7 @@
 #define VORTEX_IS_QUAD(x) ((x->codec == NULL) ?  0 : (x->codec->ext_id&0x80))
 /* Check if chip has bug. */
 #define IS_BAD_CHIP(x) (\
-       (x->rev == 0xfe && x->device == PCI_DEVICE_ID_AUREAL_VORTEX2) || \
+       (x->rev == 0xfe && x->device == PCI_DEVICE_ID_AUREAL_VORTEX_2) || \
        (x->rev == 0xfe && x->device == PCI_DEVICE_ID_AUREAL_ADVANTAGE))
 
 

Index: au88x0_synth.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/au88x0/au88x0_synth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- au88x0_synth.c      13 Apr 2004 15:26:28 -0000      1.2
+++ au88x0_synth.c      24 Apr 2004 14:57:33 -0000      1.3
@@ -157,7 +157,7 @@
                return hwread(vortex->mmio, WT_PARM(wt, 3));
        }
        if (reg == 7) {
-               return hwread(vortex->mmio, WT_GMODE(wt));;
+               return hwread(vortex->mmio, WT_GMODE(wt));
        }
 
        return 0;



-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog