From 116674acc97ba75a720329996877077d988443a2 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 9 Mar 2001 20:33:35 +0000 Subject: Merge with Linux 2.4.2. --- drivers/sound/awe_wave.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'drivers/sound/awe_wave.c') diff --git a/drivers/sound/awe_wave.c b/drivers/sound/awe_wave.c index 0b0720881..7e2258624 100644 --- a/drivers/sound/awe_wave.c +++ b/drivers/sound/awe_wave.c @@ -4772,16 +4772,25 @@ awe_detect_base(int addr) #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 = { - {ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0021), "AWE32 WaveTable"}, - {ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0022), "AWE64 WaveTable"}, - {ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0023), "AWE64 Gold WaveTable"}, - {0,} + { ISAPNP_ANY_ID, ISAPNP_ANY_ID, + ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0021), + "AWE32 WaveTable" }, + { ISAPNP_ANY_ID, ISAPNP_ANY_ID, + ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0022), + "AWE64 WaveTable" }, + { ISAPNP_ANY_ID, ISAPNP_ANY_ID, + ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0023), + "AWE64 Gold WaveTable" }, + {0} }; +MODULE_DEVICE_TABLE(isapnp, isapnp_awe_list); + static struct pci_dev *idev = NULL; static int __init awe_probe_isapnp(int *port) -- cgit v1.2.3