diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /drivers/message/fusion/mptscsih.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/message/fusion/mptscsih.c')
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 48ff314cdfbf..a0078ae5b9b8 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -2338,7 +2338,7 @@ slave_configure_exit: | |||
| 2338 | } | 2338 | } |
| 2339 | 2339 | ||
| 2340 | ssize_t | 2340 | ssize_t |
| 2341 | mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count) | 2341 | mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
| 2342 | { | 2342 | { |
| 2343 | int depth; | 2343 | int depth; |
| 2344 | struct scsi_device *sdev = to_scsi_device(dev); | 2344 | struct scsi_device *sdev = to_scsi_device(dev); |