git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
cdrom
/
viocd.c
diff --git
a/drivers/cdrom/viocd.c
b/drivers/cdrom/viocd.c
index
c0f817b
..
54ca931
100644
(file)
--- a/
drivers/cdrom/viocd.c
+++ b/
drivers/cdrom/viocd.c
@@
-49,7
+49,6
@@
#include <asm/iseries/vio.h>
#define VIOCD_DEVICE "iseries/vcd"
#include <asm/iseries/vio.h>
#define VIOCD_DEVICE "iseries/vcd"
-#define VIOCD_DEVICE_DEVFS "iseries/vcd"
#define VIOCD_VERS "1.06"
#define VIOCD_VERS "1.06"
@@
-688,8
+687,6
@@
static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
gendisk->first_minor = deviceno;
strncpy(gendisk->disk_name, c->name,
sizeof(gendisk->disk_name));
gendisk->first_minor = deviceno;
strncpy(gendisk->disk_name, c->name,
sizeof(gendisk->disk_name));
- snprintf(gendisk->devfs_name, sizeof(gendisk->devfs_name),
- VIOCD_DEVICE_DEVFS "%d", deviceno);
blk_queue_max_hw_segments(q, 1);
blk_queue_max_phys_segments(q, 1);
blk_queue_max_sectors(q, 4096 / 512);
blk_queue_max_hw_segments(q, 1);
blk_queue_max_phys_segments(q, 1);
blk_queue_max_sectors(q, 4096 / 512);
@@
-731,7
+728,7
@@
static int viocd_remove(struct vio_dev *vdev)
* support.
*/
static struct vio_device_id viocd_device_table[] __devinitdata = {
* support.
*/
static struct vio_device_id viocd_device_table[] __devinitdata = {
- { "
viocd", "
" },
+ { "
block", "IBM,iSeries-viocd
" },
{ "", "" }
};
MODULE_DEVICE_TABLE(vio, viocd_device_table);
{ "", "" }
};
MODULE_DEVICE_TABLE(vio, viocd_device_table);