diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/block/cciss.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 39b0f53186e8..05fb08312c01 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -3248,7 +3248,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
| 3248 | 3248 | ||
| 3249 | q->queuedata = hba[i]; | 3249 | q->queuedata = hba[i]; |
| 3250 | sprintf(disk->disk_name, "cciss/c%dd%d", i, j); | 3250 | sprintf(disk->disk_name, "cciss/c%dd%d", i, j); |
| 3251 | sprintf(disk->devfs_name, "cciss/host%d/target%d", i, j); | ||
| 3252 | disk->major = hba[i]->major; | 3251 | disk->major = hba[i]->major; |
| 3253 | disk->first_minor = j << NWD_SHIFT; | 3252 | disk->first_minor = j << NWD_SHIFT; |
| 3254 | disk->fops = &cciss_fops; | 3253 | disk->fops = &cciss_fops; |