diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 21:11:02 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 21:11:02 +1000 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /net/irda/irnet/irnet.h | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
| download | blackbird-op-linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.gz blackbird-op-linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/irda/irnet/irnet.h')
| -rw-r--r-- | net/irda/irnet/irnet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index bc2e15ce7004..7873c392ab4c 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -405,7 +405,7 @@ typedef struct irnet_socket /* "pppd" interact directly with us on a /dev/ file */ struct file * file; /* File descriptor of this instance */ /* TTY stuff - to keep "pppd" happy */ - struct termios termios; /* Various tty flags */ + struct ktermios termios; /* Various tty flags */ /* Stuff for the control channel */ int event_index; /* Last read in the event log */ |
