http://linux-sound.bkbits.net/linux-sound perex@suse.cz|ChangeSet|20040401093439|63511 perex # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/04/12 20:38:27-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-alsa # # include/linux/pci_ids.h # 2004/04/12 20:38:24-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/04/01 14:38:57-08:00 akpm@bix.(none) # x # # include/linux/pci_ids.h # 2004/04/01 14:38:53-08:00 akpm@bix.(none) +2 -3 # x # # ChangeSet # 2004/04/01 11:34:39+02:00 perex@suse.cz # Fixed ALSA aureal driver compilation - wrong and missing PCI IDs # # sound/pci/au88x0/au88x0.h # 2004/04/01 11:34:27+02:00 perex@suse.cz +2 -2 # sync with pci_ids.h # # sound/pci/au88x0/au8830.c # 2004/04/01 11:34:27+02:00 perex@suse.cz +1 -1 # Sync with pci_ids.h # # sound/pci/au88x0/au8820.c # 2004/04/01 11:34:27+02:00 perex@suse.cz +1 -1 # Sync with pci_ids.h # # include/linux/pci_ids.h # 2004/04/01 11:34:26+02:00 perex@suse.cz +1 -0 # Added PCI_DEVICE_ID_AUREAL_ADVANTAGE # diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h Mon Apr 12 20:39:15 2004 +++ b/include/linux/pci_ids.h Mon Apr 12 20:39:15 2004 @@ -1635,8 +1635,8 @@ #define PCI_SUBDEVICE_ID_CHASE_PCIRAS8 0xF010 #define PCI_VENDOR_ID_AUREAL 0x12eb -#define PCI_DEVICE_ID_AUREAL_VORTEX 0x0001 -#define PCI_DEVICE_ID_AUREAL_VORTEX2 0x0002 +#define PCI_DEVICE_ID_AUREAL_VORTEX_1 0x0001 +#define PCI_DEVICE_ID_AUREAL_VORTEX_2 0x0002 #define PCI_DEVICE_ID_AUREAL_ADVANTAGE 0x0003 #define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8 diff -Nru a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c --- a/sound/pci/au88x0/au8820.c Mon Apr 12 20:39:15 2004 +++ b/sound/pci/au88x0/au8820.c Mon Apr 12 20:39:15 2004 @@ -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,} }; diff -Nru a/sound/pci/au88x0/au8830.c b/sound/pci/au88x0/au8830.c --- a/sound/pci/au88x0/au8830.c Mon Apr 12 20:39:15 2004 +++ b/sound/pci/au88x0/au8830.c Mon Apr 12 20:39:15 2004 @@ -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,} }; diff -Nru a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h --- a/sound/pci/au88x0/au88x0.h Mon Apr 12 20:39:15 2004 +++ b/sound/pci/au88x0/au88x0.h Mon Apr 12 20:39:15 2004 @@ -80,8 +80,8 @@ #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 < 3 && x->device == PCI_DEVICE_ID_AUREAL_VORTEX) || \ - (x->rev < 0xfe && x->device == PCI_DEVICE_ID_AUREAL_VORTEX2) || \ + (x->rev < 3 && x->device == PCI_DEVICE_ID_AUREAL_VORTEX_1) || \ + (x->rev < 0xfe && x->device == PCI_DEVICE_ID_AUREAL_VORTEX_2) || \ (x->rev < 0xfe && x->device == PCI_DEVICE_ID_AUREAL_ADVANTAGE))