summaryrefslogtreecommitdiff
path: root/drivers/char/rocket_int.h
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-07-16 21:56:18 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 17:12:37 -0700
commite60a10844879794c7b592acf123cbf9ea0e2c0e7 (patch)
tree48aad5909524bdfa08c99c29164f40e3be7ac2d4 /drivers/char/rocket_int.h
parent0ad9e7d1d6bf7829912be50d24d4f3f473006326 (diff)
rocket: use tty_port
Switch the rocketport to use the new tty_port structure Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/rocket_int.h')
-rw-r--r--drivers/char/rocket_int.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 143cc432fdb2..3affc48f6a57 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -1125,11 +1125,9 @@ Warnings: This function writes the data byte without checking to see if
struct r_port {
int magic;
+ struct tty_port port;
int line;
- int flags;
- int count;
- int blocked_open;
- struct tty_struct *tty;
+ int flags; /* Don't yet match the ASY_ flags!! */
unsigned int board:3;
unsigned int aiop:2;
unsigned int chan:3;
@@ -1148,8 +1146,7 @@ struct r_port {
int read_status_mask;
int cps;
- wait_queue_head_t open_wait;
- struct completion close_wait;
+ struct completion close_wait; /* Not yet matching the core */
spinlock_t slock;
struct mutex write_mtx;
};