Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394

[linux-2.6-omap-h63xx.git] / include / linux / nbd.h

diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index f95d51fae733b662ea862090f406aef65fde1009..a6ce409ec6fcbffd1b00897eec3ed3d739b11aee 100644 (file)
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -38,6 +38,7 @@ enum {
 #ifdef __KERNEL__
 
 #include <linux/wait.h>
+#include <linux/mutex.h>
 
 /* values for flags field */
 #define NBD_READ_ONLY 0x0001
@@ -57,7 +58,7 @@ struct nbd_device {
        struct request *active_req;
        wait_queue_head_t active_wq;
 
-       struct semaphore tx_lock;
+       struct mutex tx_lock;
        struct gendisk *disk;
        int blksize;
        u64 bytesize;