diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/scsi/ipr.c | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
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 0edfb1fa63ce..841f460edbc4 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -2184,7 +2184,7 @@ static void ipr_dump_location_data(struct ipr_ioa_cfg *ioa_cfg, | |||
| 2184 | sizeof(struct ipr_dump_entry_header); | 2184 | sizeof(struct ipr_dump_entry_header); |
| 2185 | driver_dump->location_entry.hdr.data_type = IPR_DUMP_DATA_TYPE_ASCII; | 2185 | driver_dump->location_entry.hdr.data_type = IPR_DUMP_DATA_TYPE_ASCII; |
| 2186 | driver_dump->location_entry.hdr.id = IPR_DUMP_LOCATION_ID; | 2186 | driver_dump->location_entry.hdr.id = IPR_DUMP_LOCATION_ID; |
| 2187 | strcpy(driver_dump->location_entry.location, ioa_cfg->pdev->dev.bus_id); | 2187 | strcpy(driver_dump->location_entry.location, dev_name(&ioa_cfg->pdev->dev)); |
| 2188 | driver_dump->hdr.num_entries++; | 2188 | driver_dump->hdr.num_entries++; |
| 2189 | } | 2189 | } |
| 2190 | 2190 | ||