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/msnd_pinnacle.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/msnd_pinnacle.c')
-rw-r--r-- | drivers/sound/msnd_pinnacle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sound/msnd_pinnacle.c b/drivers/sound/msnd_pinnacle.c index 7bf7364ab..05845cf96 100644 --- a/drivers/sound/msnd_pinnacle.c +++ b/drivers/sound/msnd_pinnacle.c @@ -1913,9 +1913,9 @@ __initfunc(int msnd_pinnacle_init(void)) if (digital) set_bit(F_HAVEDIGITAL, &dev.flags); #endif - init_waitqueue(&dev.writeblock); - init_waitqueue(&dev.readblock); - init_waitqueue(&dev.writeflush); + init_waitqueue_head(&dev.writeblock); + init_waitqueue_head(&dev.readblock); + init_waitqueue_head(&dev.writeflush); msnd_fifo_init(&dev.DAPF); msnd_fifo_init(&dev.DARF); #ifndef LINUX20 |