diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/sound/wavfront.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/sound/wavfront.c')
| -rw-r--r-- | drivers/sound/wavfront.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sound/wavfront.c b/drivers/sound/wavfront.c index b6ec7c263..ac58b97da 100644 --- a/drivers/sound/wavfront.c +++ b/drivers/sound/wavfront.c @@ -290,7 +290,7 @@ struct wf_config { int samples_used; /* how many */ char interrupts_on; /* h/w MPU interrupts enabled ? */ char rom_samples_rdonly; /* can we write on ROM samples */ - struct wait_queue *interrupt_sleeper; + wait_queue_head_t interrupt_sleeper; } dev; static int detect_wffx(void); @@ -2535,7 +2535,7 @@ __initfunc (static int detect_wavefront (int irq, int io_base)) } - init_waitqueue (&dev.interrupt_sleeper); + init_waitqueue_head (&dev.interrupt_sleeper); if (wavefront_hw_reset ()) { printk (KERN_WARNING LOGNAME "hardware reset failed\n"); |