Merge branch 'acer' into release

[~andy/linux] / include / scsi / osd_initiator.h

diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
index b44dc53bd88150a6b9ccf36826e001e998bb47bb..02bd9f7163570512e19c0e98e17295a5f47561e8 100644 (file)
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
@@ -48,6 +48,7 @@ enum osd_std_version {
  */
 struct osd_dev {
        struct scsi_device *scsi_device;
+       struct file *file;
        unsigned def_timeout;
 
 #ifdef OSD_VER1_SUPPORT