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
  ...

1 files changed, 0 insertions, 25 deletions

diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index 821357ce7e0e..3eeb869a9a11 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -33,7 +33,6 @@
 #endif
 #include <linux/fcntl.h>
 #include <linux/smp_lock.h>
-#include <linux/devfs_fs_kernel.h>
 
 #include <linux/zftape.h>
 #include <linux/init.h>
@@ -332,29 +331,11 @@ KERN_INFO
         zft_class = class_create(THIS_MODULE, "zft");
         for (i = 0; i < 4; i++) {
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "qft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "nqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "zqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "nzqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "rawqft%i", i);
                 class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
-                devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),
-                                S_IFCHR | S_IRUSR | S_IWUSR,
-                                "nrawqft%i", i);
         }
 
 #ifdef CONFIG_ZFT_COMPRESSOR
@@ -380,17 +361,11 @@ static void zft_exit(void)
                 TRACE(ft_t_info, "successful");
         }
         for (i = 0; i < 4; i++) {
-                devfs_remove("qft%i", i);
                 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i));
-                devfs_remove("nqft%i", i);
                 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4));
-                devfs_remove("zqft%i", i);
                 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16));
-                devfs_remove("nzqft%i", i);
                 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20));
-                devfs_remove("rawqft%i", i);
                 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32));
-                devfs_remove("nrawqft%i", i);
                 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36));
         }
         class_destroy(zft_class);