merge by hand (scsi_device.h)

1 files changed, 2 insertions, 1 deletions

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index fe9571d2e306..c018020d9160 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -44,7 +44,8 @@ struct scsi_device {
         struct list_head    same_target_siblings; /* just the devices sharing same target id */
 
         /* this is now protected by the request_queue->queue_lock */
-        volatile unsigned short device_busy;    /* commands actually active on low-level */
+        unsigned int device_busy;       /* commands actually active on
+                                         * low-level. protected by queue_lock. */
         spinlock_t list_lock;
         struct list_head cmd_list;      /* queue of in use SCSI Command structures */
         struct list_head starved_entry;