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/53c700.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/53c700.c')
-rw-r--r-- | drivers/scsi/53c700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index d151af9a6f15..a7620fc368e7 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
@@ -2125,7 +2125,7 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type) | |||
2125 | } | 2125 | } |
2126 | 2126 | ||
2127 | static ssize_t | 2127 | static ssize_t |
2128 | NCR_700_show_active_tags(struct device *dev, char *buf) | 2128 | NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char *buf) |
2129 | { | 2129 | { |
2130 | struct scsi_device *SDp = to_scsi_device(dev); | 2130 | struct scsi_device *SDp = to_scsi_device(dev); |
2131 | 2131 | ||