Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6

[karo-tx-linux.git] / drivers / s390 / block / dasd.c

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index bafcd2f20ae241071e5fad970684bd4f088df9fa..2dc179b14ce6484e5dd6f53a8221461d0854857f 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1834,7 +1834,6 @@ dasd_exit(void)
        }
        dasd_gendisk_exit();
        dasd_devmap_exit();
-       devfs_remove("dasd");
        if (dasd_debug_area != NULL) {
                debug_unregister(dasd_debug_area);
                dasd_debug_area = NULL;
@@ -2107,9 +2106,6 @@ dasd_init(void)
 
        dasd_diag_discipline_pointer = NULL;
 
-       rc = devfs_mk_dir("dasd");
-       if (rc)
-               goto failed;
        rc = dasd_devmap_init();
        if (rc)
                goto failed;