patch-2.4.20 linux-2.4.20/drivers/sound/awe_wave.c
Next file: linux-2.4.20/drivers/sound/bin2hex.c
Previous file: linux-2.4.20/drivers/sound/au1000.c
Back to the patch index
Back to the overall index
- Lines: 35
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/sound/awe_wave.c
- Orig date:
Sun Sep 30 12:26:08 2001
diff -urN linux-2.4.19/drivers/sound/awe_wave.c linux-2.4.20/drivers/sound/awe_wave.c
@@ -4773,21 +4773,16 @@
}
#if defined CONFIG_ISAPNP || defined CONFIG_ISAPNP_MODULE
-static struct {
- unsigned short card_vendor, card_device;
- unsigned short vendor;
- unsigned short function;
- char *name;
-} isapnp_awe_list[] __initdata = {
+static struct isapnp_device_id isapnp_awe_list[] __initdata = {
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0021),
- "AWE32 WaveTable" },
+ (unsigned long)"AWE32 WaveTable" },
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0022),
- "AWE64 WaveTable" },
+ (unsigned long)"AWE64 WaveTable" },
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0023),
- "AWE64 Gold WaveTable" },
+ (unsigned long)"AWE64 Gold WaveTable" },
{0}
};
@@ -4818,7 +4813,7 @@
if (!idev)
continue;
printk(KERN_INFO "ISAPnP reports %s at i/o %#x\n",
- isapnp_awe_list[i].name, *port);
+ (char*)isapnp_awe_list[i].driver_data, *port);
return 0;
}
return -ENODEV;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)