diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
commit | 602cada851b28c5792339786efe872fbdc1f5d41 (patch) | |
tree | 233d474b74d6038b5bb54a07ad91dd1bb10b0218 /drivers/block/acsi.c | |
parent | 82991c6f2c361acc17279b8124d9bf1878973435 (diff) | |
parent | fee68d1cc0d9bd863e51c16cdcd707737b16bb38 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits)
[PATCH] devfs: Remove it from the feature_removal.txt file
[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
[PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV
[PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed
[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
[PATCH] devfs: Remove devfs_remove() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
[PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
[PATCH] devfs: Remove devfs support from the sound subsystem
[PATCH] devfs: Remove devfs support from the ide subsystem.
[PATCH] devfs: Remove devfs support from the serial subsystem
[PATCH] devfs: Remove devfs from the init code
[PATCH] devfs: Remove devfs from the partition code
...
Diffstat (limited to 'drivers/block/acsi.c')
-rw-r--r-- | drivers/block/acsi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c index 196c0ec9cd5..a317e430395 100644 --- a/drivers/block/acsi.c +++ b/drivers/block/acsi.c | |||
@@ -1732,13 +1732,10 @@ int acsi_init( void ) | |||
1732 | struct gendisk *disk = acsi_gendisk[i]; | 1732 | struct gendisk *disk = acsi_gendisk[i]; |
1733 | sprintf(disk->disk_name, "ad%c", 'a'+i); | 1733 | sprintf(disk->disk_name, "ad%c", 'a'+i); |
1734 | aip = &acsi_info[NDevices]; | 1734 | aip = &acsi_info[NDevices]; |
1735 | sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun); | ||
1736 | disk->major = ACSI_MAJOR; | 1735 | disk->major = ACSI_MAJOR; |
1737 | disk->first_minor = i << 4; | 1736 | disk->first_minor = i << 4; |
1738 | if (acsi_info[i].type != HARDDISK) { | 1737 | if (acsi_info[i].type != HARDDISK) |
1739 | disk->minors = 1; | 1738 | disk->minors = 1; |
1740 | strcat(disk->devfs_name, "/disc"); | ||
1741 | } | ||
1742 | disk->fops = &acsi_fops; | 1739 | disk->fops = &acsi_fops; |
1743 | disk->private_data = &acsi_info[i]; | 1740 | disk->private_data = &acsi_info[i]; |
1744 | set_capacity(disk, acsi_info[i].size); | 1741 | set_capacity(disk, acsi_info[i].size); |