summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-04-19 02:24:09 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-04-19 02:24:09 -0700
commit77ad1af84765f32bbda03e9c0040587ad7f952fa (patch)
treeb2ad9d66a984ef70ae7299be939aaf575866e71e /include/linux
parente4a874f09dc496ed95829f679f5df6c9db6f037f (diff)
parent3bbb0896d422a2c5d5c6f8eb584e9bda3d3277a5 (diff)
Merge bk://bk.arm.linux.org.uk/linux-2.5-serial
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tty_driver.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 0070ed49813d..0e35590dc50c 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -172,6 +172,9 @@ struct tty_driver {
int count, int *eof, void *data);
int (*write_proc)(struct file *file, const char *buffer,
unsigned long count, void *data);
+ int (*tiocmget)(struct tty_struct *tty, struct file *file);
+ int (*tiocmset)(struct tty_struct *tty, struct file *file,
+ unsigned int set, unsigned int clear);
struct list_head tty_drivers;
};