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/s390/block/dasd_genhd.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/s390/block/dasd_genhd.c')
| -rw-r--r-- | drivers/s390/block/dasd_genhd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index fce2835e7d19..61ffde718a7a 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c | |||
| @@ -68,8 +68,6 @@ dasd_gendisk_alloc(struct dasd_device *device) | |||
| 68 | } | 68 | } |
| 69 | len += sprintf(gdp->disk_name + len, "%c", 'a'+(device->devindex%26)); | 69 | len += sprintf(gdp->disk_name + len, "%c", 'a'+(device->devindex%26)); |
| 70 | 70 | ||
| 71 | sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id); | ||
| 72 | |||
| 73 | if (device->features & DASD_FEATURE_READONLY) | 71 | if (device->features & DASD_FEATURE_READONLY) |
| 74 | set_disk_ro(gdp, 1); | 72 | set_disk_ro(gdp, 1); |
| 75 | gdp->private_data = device; | 73 | gdp->private_data = device; |