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/megaraid.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/megaraid.c')
| -rw-r--r-- | drivers/scsi/megaraid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 90c95a3385d1..816db12ef5d5 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
| @@ -4244,6 +4244,7 @@ static struct scsi_host_template megaraid_template = { | |||
| 4244 | .eh_device_reset_handler = megaraid_reset, | 4244 | .eh_device_reset_handler = megaraid_reset, |
| 4245 | .eh_bus_reset_handler = megaraid_reset, | 4245 | .eh_bus_reset_handler = megaraid_reset, |
| 4246 | .eh_host_reset_handler = megaraid_reset, | 4246 | .eh_host_reset_handler = megaraid_reset, |
| 4247 | .no_write_same = 1, | ||
| 4247 | }; | 4248 | }; |
| 4248 | 4249 | ||
| 4249 | static int | 4250 | static int |