aboutsummaryrefslogtreecommitdiff
path: root/include/linux/parport.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-08 19:27:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-08 19:27:13 +0100
commit7698fdedcfa3cab3dd40c9b685590b23be02e267 (patch)
tree207ddae0f963174356b1a9de7fff8e48a9c1e9c1 /include/linux/parport.h
parent2d8d24935d372175786ebefa8a2de8680831b67f (diff)
parentae5c8c83735f5fcb09b380944e4854a383006998 (diff)
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'include/linux/parport.h')
-rw-r--r--include/linux/parport.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h
index e1f83c5065c..38a423ed3c0 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];
};