diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-04 12:27:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-04 12:27:18 +0100 |
| commit | 947ca2e983c7f46b49dbfb5bf51d39941d39f000 (patch) | |
| tree | 4a092e425960c929444d4e93a57c577c7fdb7f8c /include/linux/parport.h | |
| parent | 1946d6ef9d7bd4ba97094fe6eb68a9b877bde6b7 (diff) | |
| parent | 6b4bfb87b638a4f114dfb6f72f4ac1be88a4ebe4 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'include/linux/parport.h')
| -rw-r--r-- | include/linux/parport.h | 4 |
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]; }; |