Merge branch 'master' into next

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/parport.h b/include/linux/parport.h
index e1f83c5065c5..38a423ed3c01 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -324,6 +324,10 @@ struct parport {
         int spintime;
         atomic_t ref_count;
 
+        unsigned long devflags;
+#define PARPORT_DEVPROC_REGISTERED      0
+        struct pardevice *proc_device;  /* Currently register proc device */
+
         struct list_head full_list;
         struct parport *slaves[3];
 };