summaryrefslogtreecommitdiffstats
path: root/drivers/sound/dev_table.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /drivers/sound/dev_table.h
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (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/dev_table.h')
-rw-r--r--drivers/sound/dev_table.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sound/dev_table.h b/drivers/sound/dev_table.h
index cf6475662..7043885f0 100644
--- a/drivers/sound/dev_table.h
+++ b/drivers/sound/dev_table.h
@@ -234,9 +234,9 @@ struct audio_operations
int parent_dev; /* 0 -> no parent, 1 to n -> parent=parent_dev+1 */
/* fields formerly in dmabuf.c */
- struct wait_queue *in_sleeper;
- struct wait_queue *out_sleeper;
- struct wait_queue *poll_sleeper;
+ wait_queue_head_t in_sleeper;
+ wait_queue_head_t out_sleeper;
+ wait_queue_head_t poll_sleeper;
/* fields formerly in audio.c */
int audio_mode;