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/scsi/arm/powertec.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/scsi/arm/powertec.c')
| -rw-r--r-- | drivers/scsi/arm/powertec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index 54f23be6460f..abda216113f1 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c | |||
| @@ -269,7 +269,7 @@ int powertecscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, o | |||
| 269 | return pos; | 269 | return pos; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static ssize_t powertecscsi_show_term(struct device *dev, char *buf) | 272 | static ssize_t powertecscsi_show_term(struct device *dev, struct device_attribute *attr, char *buf) |
| 273 | { | 273 | { |
| 274 | struct expansion_card *ec = ECARD_DEV(dev); | 274 | struct expansion_card *ec = ECARD_DEV(dev); |
| 275 | struct Scsi_Host *host = ecard_get_drvdata(ec); | 275 | struct Scsi_Host *host = ecard_get_drvdata(ec); |
| @@ -279,7 +279,7 @@ static ssize_t powertecscsi_show_term(struct device *dev, char *buf) | |||
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | static ssize_t | 281 | static ssize_t |
| 282 | powertecscsi_store_term(struct device *dev, const char *buf, size_t len) | 282 | powertecscsi_store_term(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) |
| 283 | { | 283 | { |
| 284 | struct expansion_card *ec = ECARD_DEV(dev); | 284 | struct expansion_card *ec = ECARD_DEV(dev); |
| 285 | struct Scsi_Host *host = ecard_get_drvdata(ec); | 285 | struct Scsi_Host *host = ecard_get_drvdata(ec); |