diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/char/tty_io.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 06e5a3f1836d..26e5e19ed854 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -185,7 +185,7 @@ char *tty_name(struct tty_struct *tty, char *buf) | |||
| 185 | 185 | ||
| 186 | EXPORT_SYMBOL(tty_name); | 186 | EXPORT_SYMBOL(tty_name); |
| 187 | 187 | ||
| 188 | inline int tty_paranoia_check(struct tty_struct *tty, struct inode *inode, | 188 | int tty_paranoia_check(struct tty_struct *tty, struct inode *inode, |
| 189 | const char *routine) | 189 | const char *routine) |
| 190 | { | 190 | { |
| 191 | #ifdef TTY_PARANOIA_CHECK | 191 | #ifdef TTY_PARANOIA_CHECK |