diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /drivers/sound/ad1816.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'drivers/sound/ad1816.c')
| -rw-r--r-- | drivers/sound/ad1816.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/sound/ad1816.c b/drivers/sound/ad1816.c index e91d71909..bdab8a85b 100644 --- a/drivers/sound/ad1816.c +++ b/drivers/sound/ad1816.c @@ -1266,8 +1266,7 @@ static int __initdata dma = -1; static int __initdata dma2 = -1; #if defined CONFIG_ISAPNP || defined CONFIG_ISAPNP_MODULE -struct pci_dev *ad1816_dev = NULL, - *mpu_dev = NULL; +struct pci_dev *ad1816_dev = NULL; static int activated = 1; |