diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /drivers/sound/awe_wave.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/sound/awe_wave.c')
| -rw-r--r-- | drivers/sound/awe_wave.c | 17 |
1 files changed, 13 insertions, 4 deletions
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) |