Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv11805/pci
Modified Files: als4000.c azt3328.c cmipci.c cs4281.c ens1370.c es1938.c es1968.c fm801.c intel8x0.c maestro3.c rme32.c rme96.c sonicvibes.c via82xx.c Log Message: sync'ed with 2.6: removed __devinitdata from pci and pnp id tables. Index: als4000.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- als4000.c 23 Apr 2003 10:01:43 -0000 1.20 +++ als4000.c 12 Aug 2003 14:10:12 -0000 1.21 @@ -107,7 +107,7 @@ unsigned long gcr; } snd_card_als4000_t; -static struct pci_device_id snd_als4000_ids[] __devinitdata = { +static struct pci_device_id snd_als4000_ids[] = { { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */ { 0, } }; Index: azt3328.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- azt3328.c 2 Jun 2003 12:59:41 -0000 1.1 +++ azt3328.c 12 Aug 2003 14:10:12 -0000 1.2 @@ -205,7 +205,7 @@ spinlock_t reg_lock; }; -static struct pci_device_id snd_azf3328_ids[] __devinitdata = { +static struct pci_device_id snd_azf3328_ids[] = { { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */ { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */ { 0, } Index: cmipci.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- cmipci.c 2 Jul 2003 10:31:16 -0000 1.47 +++ cmipci.c 12 Aug 2003 14:10:12 -0000 1.48 @@ -2819,7 +2819,7 @@ } -static struct pci_device_id snd_cmipci_ids[] __devinitdata = { +static struct pci_device_id snd_cmipci_ids[] = { {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, Index: cs4281.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- cs4281.c 21 Jun 2003 07:52:38 -0000 1.42 +++ cs4281.c 12 Aug 2003 14:10:12 -0000 1.43 @@ -513,7 +513,7 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_cs4281_ids[] __devinitdata = { +static struct pci_device_id snd_cs4281_ids[] = { { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ { 0, } }; Index: ens1370.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ens1370.c 21 Jun 2003 07:52:38 -0000 1.46 +++ ens1370.c 12 Aug 2003 14:10:12 -0000 1.47 @@ -417,7 +417,7 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_audiopci_ids[] __devinitdata = { +static struct pci_device_id snd_audiopci_ids[] = { #ifdef CHIP1370 { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */ #endif Index: es1938.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- es1938.c 21 Jun 2003 07:52:38 -0000 1.25 +++ es1938.c 12 Aug 2003 14:10:12 -0000 1.26 @@ -251,7 +251,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_es1938_ids[] __devinitdata = { +static struct pci_device_id snd_es1938_ids[] = { { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */ { 0, } }; Index: es1968.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- es1968.c 11 Aug 2003 09:20:00 -0000 1.50 +++ es1968.c 12 Aug 2003 14:10:12 -0000 1.51 @@ -602,7 +602,7 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id, struct pt_regs *regs); -static struct pci_device_id snd_es1968_ids[] __devinitdata = { +static struct pci_device_id snd_es1968_ids[] = { /* Maestro 1 */ { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO }, /* Maestro 2 */ Index: fm801.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/fm801.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- fm801.c 2 Jun 2003 12:59:16 -0000 1.34 +++ fm801.c 12 Aug 2003 14:10:12 -0000 1.35 @@ -163,7 +163,7 @@ snd_info_entry_t *proc_entry; }; -static struct pci_device_id snd_fm801_ids[] __devinitdata = { +static struct pci_device_id snd_fm801_ids[] = { { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* FM801 */ { 0, } }; Index: intel8x0.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- intel8x0.c 11 Aug 2003 12:37:36 -0000 1.88 +++ intel8x0.c 12 Aug 2003 14:10:13 -0000 1.89 @@ -424,7 +424,7 @@ #endif }; -static struct pci_device_id snd_intel8x0_ids[] __devinitdata = { +static struct pci_device_id snd_intel8x0_ids[] = { { 0x8086, 0x2415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */ { 0x8086, 0x2425, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */ { 0x8086, 0x2445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */ @@ -2649,7 +2649,7 @@ return 0; } -static struct pci_device_id snd_intel8x0_joystick_ids[] __devinitdata = { +static struct pci_device_id snd_intel8x0_joystick_ids[] = { { 0x8086, 0x2410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 82801AA */ { 0x8086, 0x2420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 82901AB */ { 0x8086, 0x2440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH2 */ Index: maestro3.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/maestro3.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- maestro3.c 24 Jul 2003 19:05:16 -0000 1.40 +++ maestro3.c 12 Aug 2003 14:10:13 -0000 1.41 @@ -898,7 +898,7 @@ #define PCI_DEVICE_ID_ESS_MAESTRO3_2 0x199b #endif -static struct pci_device_id snd_m3_ids[] __devinitdata = { +static struct pci_device_id snd_m3_ids[] = { {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID, Index: rme32.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/rme32.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- rme32.c 23 Apr 2003 10:01:54 -0000 1.24 +++ rme32.c 12 Aug 2003 14:10:13 -0000 1.25 @@ -223,7 +223,7 @@ snd_kcontrol_t *spdif_ctl; } rme32_t; -static struct pci_device_id snd_rme32_ids[] __devinitdata = { +static struct pci_device_id snd_rme32_ids[] = { {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_DIGI32, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_DIGI32_8, Index: rme96.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/rme96.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rme96.c 3 Jul 2003 11:11:43 -0000 1.27 +++ rme96.c 12 Aug 2003 14:10:13 -0000 1.28 @@ -260,7 +260,7 @@ snd_kcontrol_t *spdif_ctl; } rme96_t; -static struct pci_device_id snd_rme96_ids[] __devinitdata = { +static struct pci_device_id snd_rme96_ids[] = { { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_DIGI96, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_DIGI96_8, Index: sonicvibes.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/sonicvibes.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sonicvibes.c 21 Jun 2003 07:52:38 -0000 1.24 +++ sonicvibes.c 12 Aug 2003 14:10:13 -0000 1.25 @@ -259,7 +259,7 @@ #endif }; -static struct pci_device_id snd_sonic_ids[] __devinitdata = { +static struct pci_device_id snd_sonic_ids[] = { { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, { 0, } }; Index: via82xx.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- via82xx.c 30 Jul 2003 10:54:03 -0000 1.44 +++ via82xx.c 12 Aug 2003 14:10:14 -0000 1.45 @@ -452,7 +452,7 @@ snd_info_entry_t *proc_entry; }; -static struct pci_device_id snd_via82xx_ids[] __devinitdata = { +static struct pci_device_id snd_via82xx_ids[] = { { 0x1106, 0x3058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, }, /* 686A */ { 0x1106, 0x3059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, }, /* VT8233 */ { 0, } ------------------------------------------------------- This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET. http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01 _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog