diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/scsi/ipr.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 17b106b79f72..80d022625c82 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -2716,7 +2716,7 @@ static int ipr_change_queue_type(struct scsi_device *sdev, int tag_type) | |||
| 2716 | * Return value: | 2716 | * Return value: |
| 2717 | * number of bytes printed to buffer | 2717 | * number of bytes printed to buffer |
| 2718 | **/ | 2718 | **/ |
| 2719 | static ssize_t ipr_show_adapter_handle(struct device *dev, char *buf) | 2719 | static ssize_t ipr_show_adapter_handle(struct device *dev, struct device_attribute *attr, char *buf) |
| 2720 | { | 2720 | { |
| 2721 | struct scsi_device *sdev = to_scsi_device(dev); | 2721 | struct scsi_device *sdev = to_scsi_device(dev); |
| 2722 | struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata; | 2722 | struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata; |