diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
| commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
| tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /drivers/scsi/3w-sas.c | |
| parent | regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.tar.xz linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.zip | |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'drivers/scsi/3w-sas.c')
| -rw-r--r-- | drivers/scsi/3w-sas.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index c845bdbeb6c0..4de346017e9f 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -1600,7 +1600,8 @@ static struct scsi_host_template driver_template = { .cmd_per_lun = TW_MAX_CMDS_PER_LUN, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = twl_host_attrs, - .emulated = 1 + .emulated = 1, + .no_write_same = 1, }; /* This function will probe and initialize a card */ |