diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/um/drivers/tty.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/um/drivers/tty.c')
| -rw-r--r-- | arch/um/drivers/tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c index 9f70edf5d8ef..11de3ac1eb5c 100644 --- a/arch/um/drivers/tty.c +++ b/arch/um/drivers/tty.c | |||
| @@ -18,7 +18,7 @@ struct tty_chan { | |||
| 18 | struct termios tt; | 18 | struct termios tt; |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | static void *tty_chan_init(char *str, int device, struct chan_opts *opts) | 21 | static void *tty_chan_init(char *str, int device, const struct chan_opts *opts) |
| 22 | { | 22 | { |
| 23 | struct tty_chan *data; | 23 | struct tty_chan *data; |
| 24 | 24 | ||
| @@ -62,7 +62,7 @@ static int tty_open(int input, int output, int primary, void *d, | |||
| 62 | return fd; | 62 | return fd; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | struct chan_ops tty_ops = { | 65 | const struct chan_ops tty_ops = { |
| 66 | .type = "tty", | 66 | .type = "tty", |
| 67 | .init = tty_chan_init, | 67 | .init = tty_chan_init, |
| 68 | .open = tty_open, | 68 | .open = tty_open, |