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, 1 insertions, 13 deletions

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index e392ee8b37a1..be5e33814cb1 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -85,7 +85,6 @@
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -393,7 +392,6 @@ static int __init cosa_init(void)
                 err = -ENODEV;
                 goto out;
         }
-        devfs_mk_dir("cosa");
         cosa_class = class_create(THIS_MODULE, "cosa");
         if (IS_ERR(cosa_class)) {
                 err = PTR_ERR(cosa_class);
@@ -402,13 +400,6 @@ static int __init cosa_init(void)
         for (i=0; i<nr_cards; i++) {
                 class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
                                 NULL, "cosa%d", i);
-                err = devfs_mk_cdev(MKDEV(cosa_major, i),
-                                S_IFCHR|S_IRUSR|S_IWUSR,
-                                "cosa/%d", i);
-                if (err) {
-                        class_device_destroy(cosa_class, MKDEV(cosa_major, i));
-                        goto out_chrdev;                
-                }
         }
         err = 0;
         goto out;
@@ -426,12 +417,9 @@ static void __exit cosa_exit(void)
         int i;
         printk(KERN_INFO "Unloading the cosa module\n");
 
-        for (i=0; i<nr_cards; i++) {
+        for (i=0; i<nr_cards; i++)
                 class_device_destroy(cosa_class, MKDEV(cosa_major, i));
-                devfs_remove("cosa/%d", i);
-        }
         class_destroy(cosa_class);
-        devfs_remove("cosa");
         for (cosa=cosa_cards; nr_cards--; cosa++) {
                 /* Clean up the per-channel data */
                 for (i=0; i<cosa->nchannels; i++) {