--- linux/drivers/ide/ide-probe.c	2005-02-23 12:16:32.000000000 +0100
+++ linux-test/drivers/ide/ide-probe.c	2005-02-24 03:02:06.000000000 +0100
@@ -1269,11 +1269,11 @@ EXPORT_SYMBOL_GPL(ide_unregister_region)
 void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)
 {
 	ide_hwif_t *hwif = drive->hwif;
-	unsigned int unit = drive->select.all & (1 << 4);
+	unsigned int unit = drive->name[2] - 'a' - hwif->index * MAX_DRIVES;
 
 	disk->major = hwif->major;
 	disk->first_minor = unit << PARTN_BITS;
-	sprintf(disk->disk_name, "hd%c", 'a' + hwif->index * MAX_DRIVES + unit);
+	disk->disk_name = drive->name;
 	disk->queue = drive->queue;
 }