diff options
| author | David Woodhouse | 2007-08-23 11:43:14 +0200 |
|---|---|---|
| committer | David Woodhouse | 2007-08-23 11:43:14 +0200 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /drivers/scsi/st.h | |
| parent | [MTD] mtdoops printk warning fixes (diff) | |
| parent | Apply memory policies to top two highest zones when highest zone is ZONE_MOVABLE (diff) | |
| download | kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.gz kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.xz kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/st.h')
| -rw-r--r-- | drivers/scsi/st.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h index 50f3deb1f9ed..6c8075712974 100644 --- a/drivers/scsi/st.h +++ b/drivers/scsi/st.h @@ -3,6 +3,7 @@ #define _ST_H #include <linux/completion.h> +#include <linux/mutex.h> #include <linux/kref.h> #include <scsi/scsi_cmnd.h> @@ -98,7 +99,7 @@ struct st_partstat { struct scsi_tape { struct scsi_driver *driver; struct scsi_device *device; - struct semaphore lock; /* For serialization */ + struct mutex lock; /* For serialization */ struct completion wait; /* For SCSI commands */ struct st_buffer *buffer; |