diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /drivers/sound/waveartist.c | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'drivers/sound/waveartist.c')
| -rw-r--r-- | drivers/sound/waveartist.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/sound/waveartist.c b/drivers/sound/waveartist.c index d1631defd..75d1a8977 100644 --- a/drivers/sound/waveartist.c +++ b/drivers/sound/waveartist.c @@ -1771,6 +1771,18 @@ MODULE_PARM(dma2, "i"); /* DMA2 */ static int __init init_waveartist(void) { + if (!io && machine_is_netwinder()) { + /* + * The NetWinder WaveArtist is at a fixed address. + * If the user does not supply an address, use the + * well-known parameters. + */ + io = 0x250; + irq = 12; + dma = 3; + dma2 = 7; + } + cfg.io_base = io; cfg.irq = irq; cfg.dma = dma; |