2 files changed, 14 insertions, 7 deletions

diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index 4a9e0f65ae60..854827b1d463 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -144,16 +144,22 @@ void proc_tty_register_driver(struct tty_driver *driver)
 {
         struct proc_dir_entry *ent;
                 
-        if (!driver->ops->read_proc || !driver->driver_name ||
-            driver->proc_entry)
+        if (!driver->driver_name || driver->proc_entry)
                 return;
 
-        ent = create_proc_entry(driver->driver_name, 0, proc_tty_driver);
-        if (!ent)
+        if (driver->ops->proc_fops) {
+                ent = proc_create_data(driver->driver_name, 0, proc_tty_driver,
+                                       driver->ops->proc_fops, driver);
+                if (!ent)
+                        return;
+        } else if (driver->ops->read_proc) {
+                ent = create_proc_entry(driver->driver_name, 0, proc_tty_driver);
+                if (!ent)
+                        return;
+                ent->read_proc = driver->ops->read_proc;
+                ent->data = driver;
+        } else
                 return;
-        ent->read_proc = driver->ops->read_proc;
-        ent->data = driver;
-
         driver->proc_entry = ent;
 }
 
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 08e088334dba..c9a69575ded6 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -264,6 +264,7 @@ struct tty_operations {
         int (*poll_get_char)(struct tty_driver *driver, int line);
         void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
 #endif
+        const struct file_operations *proc_fops;
 };
 
 struct tty_driver {