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
/
sbpcd.c
diff --git
a/drivers/cdrom/sbpcd.c
b/drivers/cdrom/sbpcd.c
index
05c9e86
..
ba50e5a
100644
(file)
--- a/
drivers/cdrom/sbpcd.c
+++ b/
drivers/cdrom/sbpcd.c
@@
-371,7
+371,6
@@
#include <linux/kernel.h>
#include <linux/cdrom.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/cdrom.h>
#include <linux/ioport.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/vmalloc.h>
@@
-382,7
+381,6
@@
#include <asm/io.h>
#include <asm/uaccess.h>
#include <stdarg.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <stdarg.h>
-#include <linux/config.h>
#include "sbpcd.h"
#define MAJOR_NR MATSUSHITA_CDROM_MAJOR
#include "sbpcd.h"
#define MAJOR_NR MATSUSHITA_CDROM_MAJOR
@@
-5808,8
+5806,6
@@
int __init sbpcd_init(void)
return -ENOMEM;
}
return -ENOMEM;
}
- devfs_mk_dir("sbp");
-
for (j=0;j<NR_SBPCD;j++)
{
struct cdrom_device_info * sbpcd_infop;
for (j=0;j<NR_SBPCD;j++)
{
struct cdrom_device_info * sbpcd_infop;
@@
-5871,7
+5867,6
@@
int __init sbpcd_init(void)
disk->fops = &sbpcd_bdops;
strcpy(disk->disk_name, sbpcd_infop->name);
disk->flags = GENHD_FL_CD;
disk->fops = &sbpcd_bdops;
strcpy(disk->disk_name, sbpcd_infop->name);
disk->flags = GENHD_FL_CD;
- sprintf(disk->devfs_name, "sbp/c0t%d", p->drv_id);
p->disk = disk;
if (register_cdrom(sbpcd_infop))
{
p->disk = disk;
if (register_cdrom(sbpcd_infop))
{
@@
-5906,7
+5901,6
@@
static void sbpcd_exit(void)
if (D_S[j].drv_id==-1) continue;
del_gendisk(D_S[j].disk);
put_disk(D_S[j].disk);
if (D_S[j].drv_id==-1) continue;
del_gendisk(D_S[j].disk);
put_disk(D_S[j].disk);
- devfs_remove("sbp/c0t%d", j);
vfree(D_S[j].sbp_buf);
if (D_S[j].sbp_audsiz>0)
vfree(D_S[j].aud_buf);
vfree(D_S[j].sbp_buf);
if (D_S[j].sbp_audsiz>0)
vfree(D_S[j].aud_buf);
@@
-5917,7
+5911,6
@@
static void sbpcd_exit(void)
}
vfree(D_S[j].sbpcd_infop);
}
}
vfree(D_S[j].sbpcd_infop);
}
- devfs_remove("sbp");
msg(DBG_INF, "%s module released.\n", major_name);
}
msg(DBG_INF, "%s module released.\n", major_name);
}