summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlan Cox <alan@etchedpixels.co.uk>2009-08-18 10:27:34 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-08 20:17:46 -0700
commit37977b63ee78ebd37669b3740b78e436b1660757 (patch)
tree0e843dceef0162fce5a65fc011840b8625ee00e0 /include
parentb6768fe15180edf89df1f96dfbf4412a0871c83b (diff)
parport: quickfix the proc registration bug
commit 05ad709d04799125ed85dd816fdb558258102172 upstream parport: quickfix the proc registration bug Ideally we should have a directory of drivers and a link to the 'active' driver. For now just show the first device which is effectively the existing semantics without a warning. This is an update on the original buggy patch that I then forgot to resubmit. Confusingly it was proposed by Red Hat, written by Etched Pixels fixed and submitted by Intel ... Resolves-Bug: http://bugzilla.kernel.org/show_bug.cgi?id=9749 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-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 6a0d7cdb5774..986252e5e76f 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -326,6 +326,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];
};