summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/3w-xxxx.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-12-19 13:56:10 +0100
committerIngo Molnar <mingo@kernel.org>2013-12-19 13:56:10 +0100
commit3331e924e7c5b98d245531b181551cb2a7380d0e (patch)
tree25c4432afd79bedc1e8941415166a5cef0c168fb /drivers/scsi/3w-xxxx.c
parentfd8526ad14c182605e42b64646344b95befd9f94 (diff)
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadblackbird-op-linux-3331e924e7c5b98d245531b181551cb2a7380d0e.tar.gz
blackbird-op-linux-3331e924e7c5b98d245531b181551cb2a7380d0e.zip
Merge tag 'v3.13-rc4' into x86/mm
Pick up the latest fixes before applying new patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/3w-xxxx.c')
-rw-r--r--drivers/scsi/3w-xxxx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index b9276d10b25c..752624e6bc00 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2279,7 +2279,8 @@ static struct scsi_host_template driver_template = {
.cmd_per_lun = TW_MAX_CMDS_PER_LUN,
.use_clustering = ENABLE_CLUSTERING,
.shost_attrs = tw_host_attrs,
- .emulated = 1
+ .emulated = 1,
+ .no_write_same = 1,
};
/* This function will probe and initialize a card */
OpenPOWER on IntegriCloud