Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / staging / comedi / comedidev.h

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 7a0d4bc..00d3c65 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -234,6 +234,7 @@ struct comedi_device_file_info {
        struct comedi_device *device;
        struct comedi_subdevice *read_subdevice;
        struct comedi_subdevice *write_subdevice;
+       struct device *hardware_device;
 };
 
 #ifdef CONFIG_COMEDI_DEBUG