summaryrefslogtreecommitdiffstats
path: root/drivers/char/planb.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/char/planb.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/char/planb.h')
-rw-r--r--drivers/char/planb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/planb.h b/drivers/char/planb.h
index 716163f6c..e57bed49b 100644
--- a/drivers/char/planb.h
+++ b/drivers/char/planb.h
@@ -175,7 +175,7 @@ struct planb {
unsigned int tab_size;
int maxlines;
int lock;
- struct wait_queue *lockq;
+ wait_queue_head_t lockq;
unsigned int irq; /* interrupt number */
volatile unsigned int intr_mask;
@@ -190,13 +190,13 @@ struct planb {
unsigned long ch1_cmd_phys;
volatile unsigned char *mask; /* Clipmask buffer */
int suspend;
- struct wait_queue *suspendq;
+ wait_queue_head_t suspendq;
struct planb_suspend suspended;
int cmd_buff_inited; /* cmd buffer inited? */
int grabbing;
unsigned int gcount;
- struct wait_queue *capq;
+ wait_queue_head_t capq;
int last_fr;
int prev_last_fr;
unsigned char *fbuffer;