linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / block / acsi.c

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 0b80fbb..196c0ec 100644 (file)
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -43,6 +43,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
@@ -1731,10 +1732,13 @@ int acsi_init( void )
                struct gendisk *disk = acsi_gendisk[i];
                sprintf(disk->disk_name, "ad%c", 'a'+i);
                aip = &acsi_info[NDevices];
+               sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun);
                disk->major = ACSI_MAJOR;
                disk->first_minor = i << 4;
-               if (acsi_info[i].type != HARDDISK)
+               if (acsi_info[i].type != HARDDISK) {
                        disk->minors = 1;
+                       strcat(disk->devfs_name, "/disc");
+               }
                disk->fops = &acsi_fops;
                disk->private_data = &acsi_info[i];
                set_capacity(disk, acsi_info[i].size);