From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 29 Jun 2006 21:19:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6
X-Git-Tag: v2.6.18-rc1~351
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=602cada851b28c5792339786efe872fbdc1f5d41;p=linux-2.6

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

602cada851b28c5792339786efe872fbdc1f5d41
diff --cc drivers/char/istallion.c
index 216c79256d,1386d6a519..c74e5660a9
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@@ -39,10 -39,8 +39,9 @@@
  #include <linux/ioport.h>
  #include <linux/delay.h>
  #include <linux/init.h>
- #include <linux/devfs_fs_kernel.h>
  #include <linux/device.h>
  #include <linux/wait.h>
 +#include <linux/eisa.h>
  
  #include <asm/io.h>
  #include <asm/uaccess.h>
diff --cc drivers/char/stallion.c
index 00b4a21871,38fdd4da24..0f7a542d90
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@@ -755,13 -769,11 +754,10 @@@ static void __exit stallion_module_exit
  	if (i) {
  		printk("STALLION: failed to un-register tty driver, "
  			"errno=%d\n", -i);
 -		restore_flags(flags);
  		return;
  	}
- 	for (i = 0; i < 4; i++) {
- 		devfs_remove("staliomem/%d", i);
+ 	for (i = 0; i < 4; i++)
  		class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
- 	}
- 	devfs_remove("staliomem");
  	if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
  		printk("STALLION: failed to un-register serial memory device, "
  			"errno=%d\n", -i);