diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 08:45:00 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 08:45:00 -0500 |
| commit | 68e67d97e1f91ed11e041b67f3a1336f518c608f (patch) | |
| tree | 1de288bc05f1cf1bfec20200a60ffe99dcce77ae /drivers/scsi/3w-xxxx.c | |
| parent | 9e03d05eee4ca45ed12749ef6c26bf616262cdd2 (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into spi-rcar
To resolve spurious merge conflicts with fixes.
Linux 3.13-rc6
Diffstat (limited to 'drivers/scsi/3w-xxxx.c')
| -rw-r--r-- | drivers/scsi/3w-xxxx.c | 3 |
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 = { | |||
| 2279 | .cmd_per_lun = TW_MAX_CMDS_PER_LUN, | 2279 | .cmd_per_lun = TW_MAX_CMDS_PER_LUN, |
| 2280 | .use_clustering = ENABLE_CLUSTERING, | 2280 | .use_clustering = ENABLE_CLUSTERING, |
| 2281 | .shost_attrs = tw_host_attrs, | 2281 | .shost_attrs = tw_host_attrs, |
| 2282 | .emulated = 1 | 2282 | .emulated = 1, |
| 2283 | .no_write_same = 1, | ||
| 2283 | }; | 2284 | }; |
| 2284 | 2285 | ||
| 2285 | /* This function will probe and initialize a card */ | 2286 | /* This function will probe and initialize a card */ |