Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 6226504d9108..40f38d896777 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -104,7 +104,7 @@
 #include <linux/fs.h>
 #include <linux/wait.h>
 
-struct tty_ldisc {
+struct tty_ldisc_ops {
         int     magic;
         char    *name;
         int     num;
@@ -142,6 +142,11 @@ struct tty_ldisc {
         int refcount;
 };
 
+struct tty_ldisc {
+        struct tty_ldisc_ops *ops;
+        int refcount;
+};
+
 #define TTY_LDISC_MAGIC 0x5403
 
 #define LDISC_FLAG_DEFINED      0x00000001