diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/sound/awe_wave.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/sound/awe_wave.c')
| -rw-r--r-- | drivers/sound/awe_wave.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/sound/awe_wave.c b/drivers/sound/awe_wave.c index 7e2258624..5f99eb41c 100644 --- a/drivers/sound/awe_wave.c +++ b/drivers/sound/awe_wave.c @@ -206,7 +206,7 @@ static awe_chan_info channels[AWE_MAX_CHANNELS]; int io = AWE_DEFAULT_BASE_ADDR; /* Emu8000 base address */ int memsize = AWE_DEFAULT_MEM_SIZE; /* memory size in Kbytes */ #if defined CONFIG_ISAPNP || defined CONFIG_ISAPNP_MODULE -static int isapnp = 1; +static int isapnp = -1; #else static int isapnp = 0; #endif @@ -4843,10 +4843,12 @@ awe_detect(void) if (isapnp) { if (awe_probe_isapnp(&io) < 0) { printk(KERN_ERR "AWE32: No ISAPnP cards found\n"); - return 0; + if (isapnp != -1) + return 0; + } else { + setup_ports(io, 0, 0); + return 1; } - setup_ports(io, 0, 0); - return 1; } #endif /* isapnp */ |