Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1:/tmp/cvs-serv11805/isa
Modified Files:
als100.c azt2320.c cmi8330.c dt019x.c es18xx.c opl3sa2.c
sscape.c
Log Message:
sync'ed with 2.6:
removed __devinitdata from pci and pnp id tables.
Index: als100.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- als100.c 11 Apr 2003 07:40:26 -0000 1.19
+++ als100.c 12 Aug 2003 14:10:10 -0000 1.20
@@ -98,7 +98,7 @@
struct pnp_dev *devopl;
};
-static struct pnp_card_device_id snd_als100_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_als100_pnpids[] = {
/* ALS100 - PRO16PNP */
{ .id = "ALS0001", .devs = { { "@@@0001" }, { "@[EMAIL PROTECTED]" }, {
"@[EMAIL PROTECTED]" } } },
/* ALS110 - MF1000 - Digimate 3D Sound */
Index: azt2320.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- azt2320.c 9 May 2003 14:07:23 -0000 1.19
+++ azt2320.c 12 Aug 2003 14:10:10 -0000 1.20
@@ -109,7 +109,7 @@
struct pnp_dev *devmpu;
};
-static struct pnp_card_device_id snd_azt2320_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_azt2320_pnpids[] = {
/* PRO16V */
{ .id = "AZT1008", .devs = { { "AZT1008" }, { "AZT2001" }, } },
/* Aztech Sound Galaxy 16 */
Index: cmi8330.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cmi8330.c 21 Jul 2003 08:47:35 -0000 1.22
+++ cmi8330.c 12 Aug 2003 14:10:10 -0000 1.23
@@ -172,7 +172,7 @@
#ifdef CONFIG_PNP
-static struct pnp_card_device_id snd_cmi8330_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_cmi8330_pnpids[] = {
{ .id = "CMI0001", .devs = { { "@@@0001" }, { "@[EMAIL PROTECTED]" } } },
{ .id = "" }
};
Index: dt019x.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dt019x.c 9 May 2003 14:07:23 -0000 1.10
+++ dt019x.c 12 Aug 2003 14:10:10 -0000 1.11
@@ -88,7 +88,7 @@
struct pnp_dev *devopl;
};
-static struct pnp_card_device_id snd_dt019x_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_dt019x_pnpids[] = {
/* DT197A30 */
{ .id = "RWB1688", .devs = { { "@@@0001" }, { "@[EMAIL PROTECTED]" }, {
"@[EMAIL PROTECTED]" }, } },
/* DT0196 / ALS-007 */
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- es18xx.c 21 Jul 2003 08:47:35 -0000 1.35
+++ es18xx.c 12 Aug 2003 14:10:10 -0000 1.36
@@ -1940,7 +1940,7 @@
#ifdef CONFIG_PNP
-static struct pnp_card_device_id snd_audiodrive_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_audiodrive_pnpids[] = {
/* ESS 1868 (integrated on Compaq dual P-Pro motherboard and Genius 18PnP 3D)
*/
{ .id = "ESS1868", .devs = { { "ESS1868" }, { "ESS0000" } } },
/* ESS 1868 (integrated on Maxisound Cards) */
Index: opl3sa2.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- opl3sa2.c 8 Jul 2003 10:41:34 -0000 1.27
+++ opl3sa2.c 12 Aug 2003 14:10:11 -0000 1.28
@@ -161,7 +161,7 @@
#ifdef CONFIG_PNP
-static struct pnp_card_device_id snd_opl3sa2_pnpids[] __devinitdata = {
+static struct pnp_card_device_id snd_opl3sa2_pnpids[] = {
/* Yamaha YMF719E-S (Genius Sound Maker 3DX) */
{ .id = "YMH0020", .devs = { { "YMH0021" } } },
/* Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard) */
Index: sscape.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sscape.c 14 Jul 2003 12:35:56 -0000 1.3
+++ sscape.c 12 Aug 2003 14:10:11 -0000 1.4
@@ -78,7 +78,7 @@
MODULE_PARM_SYNTAX(dma, SNDRV_DMA8_DESC);
#ifdef CONFIG_PNP
-static struct pnp_card_device_id sscape_pnpids[] __devinitdata = {
+static struct pnp_card_device_id sscape_pnpids[] = {
{ .id = "ENS3081", .devs = { { "ENS0000" } } },
{ .id = "" } /* end */
};
-------------------------------------------------------
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
