Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 244bb8de2b921525f402689a8a20e9ca95cdbbc7..e500171c745f2e574a2f199fcdd5c92931e2095f 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -257,6 +257,7 @@ struct tty_operations;
 struct tty_struct {
        int     magic;
        struct kref kref;
+       struct device *dev;
        struct tty_driver *driver;
        const struct tty_operations *ops;
        int index;
@@ -466,7 +467,7 @@ extern void proc_clear_tty(struct task_struct *p);
 extern struct tty_struct *get_current_tty(void);
 extern void tty_default_fops(struct file_operations *fops);
 extern struct tty_struct *alloc_tty_struct(void);
-extern void tty_add_file(struct tty_struct *tty, struct file *file);
+extern int tty_add_file(struct tty_struct *tty, struct file *file);
 extern void free_tty_struct(struct tty_struct *tty);
 extern void initialize_tty_struct(struct tty_struct *tty,
                struct tty_driver *driver, int idx);