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 /include/asm-sparc/audioio.h | |
| 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 'include/asm-sparc/audioio.h')
| -rw-r--r-- | include/asm-sparc/audioio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sparc/audioio.h b/include/asm-sparc/audioio.h index ca5e06538..27543806b 100644 --- a/include/asm-sparc/audioio.h +++ b/include/asm-sparc/audioio.h @@ -275,7 +275,7 @@ struct sparcaudio_driver struct linux_sbus_device *dev; /* Processes blocked on open() sit here. */ - struct wait_queue *open_wait; + wait_queue_head_t open_wait; /* Task queue for this driver's bottom half. */ struct tq_struct tqueue; @@ -288,7 +288,7 @@ struct sparcaudio_driver size_t *output_sizes, output_size, output_buffer_size; int num_output_buffers, output_front, output_rear, output_offset; int output_count, output_active, playing_count, output_eof; - struct wait_queue *output_write_wait, *output_drain_wait; + wait_queue_head_t output_write_wait, output_drain_wait; char *output_notify; /* Support for a circular queue of input buffers. */ @@ -296,7 +296,7 @@ struct sparcaudio_driver size_t *input_sizes, input_size, input_buffer_size; int num_input_buffers, input_front, input_rear, input_offset; int input_count, input_active, recording_count; - struct wait_queue *input_read_wait; + wait_queue_head_t input_read_wait; /* Hack to make it look like we support variable size buffers. */ int buffer_size; |