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.2255_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
drivers
/
block
/
mambo_bd.c
diff --git
a/drivers/block/mambo_bd.c
b/drivers/block/mambo_bd.c
index
fdae3e6
..
1217ae7
100644
(file)
--- a/
drivers/block/mambo_bd.c
+++ b/
drivers/block/mambo_bd.c
@@
-46,8
+46,6
@@
#include <asm/systemsim.h>
#include <asm/systemsim.h>
-#include <linux/devfs_fs_kernel.h>
-
#include <asm/uaccess.h>
#include <asm/types.h>
#include <asm/uaccess.h>
#include <asm/types.h>
@@
-248,7
+246,6
@@
static int __init mbd_init(void)
printk("mambo bogus disk: compiled in with kernel\n");
#endif
printk("mambo bogus disk: compiled in with kernel\n");
#endif
- devfs_mk_dir("mambobd");
for (i = 0; i < MAX_MBD; i++) { /* load defaults */
struct gendisk *disk = mbd_dev[i].disk;
mbd_dev[i].initialized = 0;
for (i = 0; i < MAX_MBD; i++) { /* load defaults */
struct gendisk *disk = mbd_dev[i].disk;
mbd_dev[i].initialized = 0;
@@
-259,7
+256,6
@@
static int __init mbd_init(void)
disk->fops = &mbd_fops;
disk->private_data = &mbd_dev[i];
sprintf(disk->disk_name, "mambobd%d", i);
disk->fops = &mbd_fops;
disk->private_data = &mbd_dev[i];
sprintf(disk->disk_name, "mambobd%d", i);
- sprintf(disk->devfs_name, "mambobd%d", i);
set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */
add_disk(disk);
}
set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */
add_disk(disk);
}
@@
-276,8
+272,6
@@
static int __init mbd_init(void)
static void __exit mbd_cleanup(void)
{
static void __exit mbd_cleanup(void)
{
- devfs_remove("mambobd");
-
if (unregister_blkdev(MAJOR_NR, "mbd") != 0)
printk("mbd: cleanup_module failed\n");
else
if (unregister_blkdev(MAJOR_NR, "mbd") != 0)
printk("mbd: cleanup_module failed\n");
else