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, 7 deletions

diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index ddcd330b9e89..55b2b31bd7ab 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -164,10 +164,6 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance)
                 return -EINVAL;
         if (init_vfc_hw(dev))
                 return -EIO;
-
-        devfs_mk_cdev(MKDEV(VFC_MAJOR, instance),
-                        S_IFCHR | S_IRUSR | S_IWUSR,
-                        "vfc/%d", instance);
         return 0;
 }
 
@@ -677,7 +673,6 @@ static int vfc_probe(void)
                 kfree(vfc_dev_lst);
                 return -EIO;
         }
-        devfs_mk_dir("vfc");
         instance = 0;
         for_all_sbusdev(sdev, sbus) {
                 if (strcmp(sdev->prom_name, "vfc") == 0) {
@@ -717,7 +712,6 @@ static void deinit_vfc_device(struct vfc_dev *dev)
 {
         if(dev == NULL)
                 return;
-        devfs_remove("vfc/%d", dev->instance);
         sbus_iounmap(dev->regs, sizeof(struct vfc_regs));
         kfree(dev);
 }
@@ -731,7 +725,6 @@ void cleanup_module(void)
         for (devp = vfc_dev_lst; *devp; devp++)
                 deinit_vfc_device(*devp);
 
-        devfs_remove("vfc");
         kfree(vfc_dev_lst);
         return;
 }