diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 21:37:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 21:37:33 -0800 |
| commit | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (patch) | |
| tree | 2f4e92634d518a4d26614a113ce724dc97ccd898 /drivers/infiniband/ulp/srp/ib_srp.h | |
| parent | 2f4c5416b36a5601d57f09e87a514a171390d5e0 (diff) | |
| parent | fd9cfdd11be3b37b5c919b64b43990f14a1587bd (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Diffstat (limited to 'drivers/infiniband/ulp/srp/ib_srp.h')
| -rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h index b564f18caf7..4e7727df32f 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.h +++ b/drivers/infiniband/ulp/srp/ib_srp.h @@ -37,8 +37,7 @@ #include <linux/types.h> #include <linux/list.h> - -#include <asm/semaphore.h> +#include <linux/mutex.h> #include <scsi/scsi_host.h> #include <scsi/scsi_cmnd.h> @@ -85,7 +84,7 @@ struct srp_host { struct ib_mr *mr; struct class_device class_dev; struct list_head target_list; - struct semaphore target_mutex; + struct mutex target_mutex; struct completion released; struct list_head list; }; |