diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2008-04-28 17:36:20 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-29 19:34:07 -0500 |
| commit | 49dd09613cf8ae3b697c341c501b7526b462cfeb (patch) | |
| tree | 4fc280504d79accf50ddff2e48b78226f131213d /drivers/scsi | |
| parent | 69cd39e94669e2994277a29249b6ef93b088ddbb (diff) | |
| download | linux-49dd09613cf8ae3b697c341c501b7526b462cfeb.tar.gz linux-49dd09613cf8ae3b697c341c501b7526b462cfeb.tar.bz2 linux-49dd09613cf8ae3b697c341c501b7526b462cfeb.zip | |
[SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions
Due to recent device model changes it now no longer tolerates name
collisions. This causes a problem for ipr whose "state" attribute
collides with an identically named one in the SCSI mid-layer. Rename
the ipr driver attribute to be more specific.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
| -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 de5ae6a65029..999e91ea7451 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -2791,7 +2791,7 @@ static ssize_t ipr_store_adapter_state(struct device *dev, static struct device_attribute ipr_ioa_state_attr = { .attr = { - .name = "state", + .name = "online_state", .mode = S_IRUGO | S_IWUSR, }, .show = ipr_show_adapter_state, |