[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree

Also fixes up all files that #include it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index 09664ab..bc3df95 100644 (file)
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -26,7 +26,6 @@
 #include <linux/slab.h>
 #include <linux/syscalls.h>
 #include <linux/in.h>
 #include <linux/slab.h>
 #include <linux/syscalls.h>
 #include <linux/in.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include <net/sock.h>
 
 
 #include <net/sock.h>
 

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 6c2d4cc..ee1fe6a 100644 (file)
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -8,7 +8,6 @@
 #include "linux/list.h"
 #include "linux/kd.h"
 #include "linux/interrupt.h"
 #include "linux/list.h"
 #include "linux/kd.h"
 #include "linux/interrupt.h"

-#include "linux/devfs_fs_kernel.h"

 #include "asm/uaccess.h"
 #include "chan_kern.h"
 #include "irq_user.h"
 #include "asm/uaccess.h"
 #include "chan_kern.h"
 #include "irq_user.h"

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 3883c5e..5856a02 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -25,7 +25,6 @@
 #include "linux/blkdev.h"
 #include "linux/hdreg.h"
 #include "linux/init.h"
 #include "linux/blkdev.h"
 #include "linux/hdreg.h"
 #include "linux/init.h"

-#include "linux/devfs_fs_kernel.h"

 #include "linux/cdrom.h"
 #include "linux/proc_fs.h"
 #include "linux/ctype.h"
 #include "linux/cdrom.h"
 #include "linux/proc_fs.h"
 #include "linux/ctype.h"

diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 7495fef..4030a8f 100644 (file)
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -65,7 +65,6 @@ not be guaranteed. There are several ways to assure this:
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/smp_lock.h>
 
 #include <asm/pgtable.h>
 #include <linux/smp_lock.h>
 
 #include <asm/pgtable.h>

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 2701ed7..f96e6c0 100644 (file)
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -33,7 +33,6 @@
 #include <linux/blkpg.h>
 #include <linux/timer.h>
 #include <linux/proc_fs.h>
 #include <linux/blkpg.h>
 #include <linux/timer.h>
 #include <linux/proc_fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/init.h>
 #include <linux/hdreg.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <linux/hdreg.h>
 #include <linux/spinlock.h>

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 8e101a9..0242cbb 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -177,7 +177,6 @@ static int print_unex = 1;
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/platform_device.h>
 #include <linux/buffer_head.h> /* for invalidate_buffers() */
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/buffer_head.h> /* for invalidate_buffers() */
 #include <linux/mutex.h>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 0319b09..dbf905c 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -63,7 +63,6 @@
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/smp_lock.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/swap.h>
 #include <linux/slab.h>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index c24b349..b164ee0 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -29,8 +29,6 @@
 #include <linux/kernel.h>
 #include <net/sock.h>
 
 #include <linux/kernel.h>
 #include <net/sock.h>
 

-#include <linux/devfs_fs_kernel.h>
-

 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/types.h>

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index e6f1614..13f998a 100644 (file)
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -156,7 +156,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index ea12073..35fb266 100644 (file)
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -141,7 +141,6 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index acaa2ab..536be2d 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -50,7 +50,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/pagemap.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <linux/pagemap.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 018b292..ef557b1 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -25,7 +25,6 @@
 #include <linux/fd.h>
 #include <linux/ioctl.h>
 #include <linux/blkdev.h>
 #include <linux/fd.h>
 #include <linux/ioctl.h>
 #include <linux/blkdev.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index a366ea8..3a48145 100644 (file)
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -18,7 +18,6 @@
 #include <linux/spinlock.h>
 #include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/blkdev.h>
 #include <linux/sched.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/interrupt.h>
 #include <linux/compiler.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/compiler.h>
 #include <linux/workqueue.h>

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index b68abc9..87ec645 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -24,7 +24,6 @@
 #include <linux/usb.h>
 #include <linux/usb_usual.h>
 #include <linux/blkdev.h>
 #include <linux/usb.h>
 #include <linux/usb_usual.h>
 #include <linux/blkdev.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/timer.h>
 #include <scsi/scsi.h>
 
 #include <linux/timer.h>
 #include <scsi/scsi.h>
 

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 72ffd64..5f0f202 100644 (file)
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -161,7 +161,6 @@
 #include <linux/hdreg.h>
 #include <linux/genhd.h>
 #include <linux/ioport.h>
 #include <linux/hdreg.h>
 #include <linux/genhd.h>
 #include <linux/ioport.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/init.h>

diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index f43a988..4ee2886 100644 (file)
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -187,7 +187,6 @@ History:
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/cdrom.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/cdrom.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/slab.h>

diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 0f6e7aa..788c7a0 100644 (file)
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -74,7 +74,6 @@ static const char *mcdx_c_version
 #include <linux/major.h>
 #define MAJOR_NR MITSUMI_X_CDROM_MAJOR
 #include <linux/blkdev.h>
 #include <linux/major.h>
 #define MAJOR_NR MITSUMI_X_CDROM_MAJOR
 #include <linux/blkdev.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include "mcdx.h"
 
 
 #include "mcdx.h"
 

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 55cbd23..a75b363 100644 (file)
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -371,7 +371,6 @@
 #include <linux/kernel.h>
 #include <linux/cdrom.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/cdrom.h>
 #include <linux/ioport.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/major.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/major.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>

diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index ee32e58..09b4136 100644 (file)
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -33,7 +33,6 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/smp_lock.h>
 #include <linux/device.h>
 
 #include <linux/smp_lock.h>
 #include <linux/device.h>
 

diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 6da88e2..da2c89f 100644 (file)
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -62,7 +62,6 @@
 #include <linux/init.h>                /* for __init, module_{init,exit} */
 #include <linux/poll.h>                /* for POLLIN, etc. */
 #include <linux/dtlk.h>                /* local header file for DoubleTalk values */
 #include <linux/init.h>                /* for __init, module_{init,exit} */
 #include <linux/poll.h>                /* for POLLIN, etc. */
 #include <linux/dtlk.h>                /* local header file for DoubleTalk values */

-#include <linux/devfs_fs_kernel.h>

 #include <linux/smp_lock.h>
 
 #ifdef TRACING
 #include <linux/smp_lock.h>
 
 #ifdef TRACING

diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index e09ad2b..3eeb869 100644 (file)
--- 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>
 #endif
 #include <linux/fcntl.h>
 #include <linux/smp_lock.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include <linux/zftape.h>
 #include <linux/init.h>
 
 #include <linux/zftape.h>
 #include <linux/init.h>

diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 5d2d573..a273eef 100644 (file)
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -91,7 +91,6 @@
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>

diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 3103ed8..da637ad 100644 (file)
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -40,7 +40,6 @@
 #include <linux/poll.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/ipmi.h>
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/ipmi.h>
 #include <linux/mutex.h>
 #include <linux/init.h>

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 0a5808e..1386d6a 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -39,7 +39,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #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/device.h>
 #include <linux/wait.h>
 

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 530b19d..b11a390 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -120,7 +120,6 @@
 #include <linux/major.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/major.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/slab.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index e7aa715..6fe7b6c 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -20,7 +20,6 @@
 #include <linux/tty.h>
 #include <linux/capability.h>
 #include <linux/smp_lock.h>
 #include <linux/tty.h>
 #include <linux/capability.h>
 #include <linux/smp_lock.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/ptrace.h>
 #include <linux/device.h>
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
 #include <linux/device.h>
 #include <linux/highmem.h>

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index bf2e49e..f1fdd84 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -44,7 +44,6 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/device.h>

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index d65b310..f25168a 100644 (file)
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -25,7 +25,6 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/mm.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/mmtimer.h>
 #include <linux/miscdevice.h>
 #include <linux/posix-timers.h>
 #include <linux/mmtimer.h>
 #include <linux/miscdevice.h>
 #include <linux/posix-timers.h>

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index c8a2eb1..24231d9 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -60,7 +60,6 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/device.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/ioctl.h>
 #include <linux/parport.h>
 #include <linux/ctype.h>
 #include <linux/ioctl.h>
 #include <linux/parport.h>
 #include <linux/ctype.h>

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 64d3d1d..345f8b8 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/sysctl.h>
 
 #include <asm/uaccess.h>
 #include <linux/sysctl.h>
 
 #include <asm/uaccess.h>

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 941a17a..9bf97c5 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -10,7 +10,6 @@
 
 #include <linux/init.h>
 #include <linux/fs.h>
 
 #include <linux/init.h>
 #include <linux/fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/major.h>
 #include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/major.h>
 #include <linux/blkdev.h>
 #include <linux/module.h>

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 7840eb1..36df18c 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -40,7 +40,6 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/device.h>
 #include <linux/delay.h>
 
 #include <linux/device.h>
 #include <linux/delay.h>
 

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 48476f8..f7802e5 100644 (file)
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -56,7 +56,6 @@
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <linux/bitops.h>

-#include <linux/devfs_fs_kernel.h>     /* DevFs support */

 #include <linux/parport.h>             /* Our code depend on parport */
 #include <linux/device.h>
 
 #include <linux/parport.h>             /* Our code depend on parport */
 #include <linux/device.h>
 

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index b8e03a3..ebe1158 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -102,7 +102,6 @@
 #include <linux/kbd_kern.h>
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/kbd_kern.h>
 #include <linux/vt_kern.h>
 #include <linux/selection.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include <linux/kmod.h>
 
 
 #include <linux/kmod.h>
 

diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 2266fba..234d7f3 100644 (file)
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -26,7 +26,6 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/tty.h>
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/tty.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index b101134..198f150 100644 (file)
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -43,7 +43,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/major.h>
 #include <linux/completion.h>
 #include <linux/proc_fs.h>
 #include <linux/major.h>
 #include <linux/completion.h>
 #include <linux/proc_fs.h>

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 714d95f..42afe7c 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -79,7 +79,6 @@
 #include <linux/mm.h>
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/console.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/tiocl.h>
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/tiocl.h>

diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 5a2703b..71a8eea 100644 (file)
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/device.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/miscdevice.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
 #include <linux/miscdevice.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 1200d1d..334402e 100644 (file)
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -39,7 +39,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/moduleparam.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/isdn/capiutil.h>
 #include <linux/isdn/capicmd.h>
 #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
 #include <linux/isdn/capiutil.h>
 #include <linux/isdn/capicmd.h>
 #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)

diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 83841d1..b163c59 100644 (file)
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -17,7 +17,6 @@
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/poll.h>

-#include <linux/devfs_fs_kernel.h>

 #include <asm/uaccess.h>
 
 #include "platform.h"
 #include <asm/uaccess.h>
 
 #include "platform.h"

diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index dcd5b65..6e7d89a 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -19,7 +19,6 @@
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>

-#include <linux/devfs_fs_kernel.h>

 #include <asm/uaccess.h>
 
 #include "platform.h"
 #include <asm/uaccess.h>
 
 #include "platform.h"

diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index bbb7d8f..9dee6a3 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

-#include <linux/devfs_fs_kernel.h>

 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index a60e3ab..9f1a049 100644 (file)
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -36,7 +36,6 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/device.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/device.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 361d50b..3ad60ca 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/wait.h>
 #include <linux/slab.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/dm-ioctl.h>
 #include <linux/hdreg.h>
 
 #include <linux/dm-ioctl.h>
 #include <linux/hdreg.h>
 

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9fc2314..95c275d 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -39,7 +39,6 @@
 #include <linux/raid/md.h>
 #include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>
 #include <linux/raid/md.h>
 #include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/suspend.h>
 #include <linux/poll.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/suspend.h>
 #include <linux/poll.h>

diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index d7a976d..7a7f75f 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -27,7 +27,6 @@
 #include <linux/poll.h>
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/poll.h>
 #include <linux/fs.h>
 #include <linux/list.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/smp_lock.h>
 
 #define DVB_MAJOR 212
 #include <linux/smp_lock.h>
 
 #define DVB_MAJOR 212

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 3e2e121..9c79696 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -6,10 +6,6 @@
 #include <linux/netdevice.h>
 #include <linux/i2c.h>
 
 #include <linux/netdevice.h>
 #include <linux/i2c.h>
 

-#ifdef CONFIG_DEVFS_FS
-#include <linux/devfs_fs_kernel.h>
-#endif
-

 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>

diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 6e08e32..ae14f5f 100644 (file)
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -20,7 +20,6 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
 
 #include <linux/config.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/errno.h>

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 3178353..a802a7e 100644 (file)
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -37,7 +37,6 @@
 #include <linux/init.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>

-#include <linux/devfs_fs_kernel.h>

 #include <asm/uaccess.h>
 #include <asm/system.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
 

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 2e5218b..46138f4 100644 (file)
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -27,7 +27,6 @@
 #include <linux/hdreg.h>
 #include <linux/kdev_t.h>
 #include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/kdev_t.h>
 #include <linux/blkdev.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/mutex.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mutex.h>
 
 #include <linux/mmc/card.h>

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 16a59ca..425ff5b 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -28,7 +28,6 @@
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/list.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/netdevice.h>
 #include <linux/poll.h>
 #include <linux/ppp_defs.h>
 #include <linux/netdevice.h>
 #include <linux/poll.h>
 #include <linux/ppp_defs.h>

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 3d1e2b6..be5e338 100644 (file)
--- 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/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>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/errno.h>

diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index d4b13e3..1893797 100644 (file)
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -54,7 +54,6 @@
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/blkdev.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/genhd.h>
 #include <linux/hdreg.h>
 #include <linux/interrupt.h>
 #include <linux/genhd.h>
 #include <linux/hdreg.h>
 #include <linux/interrupt.h>

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 15aad01..f57a6c8 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -36,7 +36,6 @@
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
 #include <linux/sysdev.h>
 #include <linux/bio.h>
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
 #include <linux/sysdev.h>
 #include <linux/bio.h>

-#include <linux/devfs_fs_kernel.h>

 #include <asm/uaccess.h>
 
 #define XPRAM_NAME     "xpram"
 #include <asm/uaccess.h>
 
 #define XPRAM_NAME     "xpram"

diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 03ff5a3..385f4f7 100644 (file)
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -20,7 +20,6 @@
 #include <linux/timer.h>
 #include <linux/ioport.h>
 #include <linux/major.h>
 #include <linux/timer.h>
 #include <linux/ioport.h>
 #include <linux/major.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>

diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h
index 8045cd5..63941a2 100644 (file)
--- a/drivers/sbus/char/vfc.h
+++ b/drivers/sbus/char/vfc.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_VFC_H_
 #define _LINUX_VFC_H_
 
 #ifndef _LINUX_VFC_H_
 #define _LINUX_VFC_H_
 

-#include <linux/devfs_fs_kernel.h>
-

 /*
  * The control register for the vfc is at offset 0x4000
  * The first field ram bank is located at offset 0x5000
 /*
  * The control register for the vfc is at offset 0x4000
  * The first field ram bank is located at offset 0x5000

diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index bc5b1d2..e41f49a 100644 (file)
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -28,7 +28,6 @@
 
 #include <linux/kmod.h>
 #include <linux/sem.h>
 
 #include <linux/kmod.h>
 #include <linux/sem.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/mutex.h>
 
 #define PHONE_NUM_DEVICES      256
 #include <linux/mutex.h>
 
 #define PHONE_NUM_DEVICES      256

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index afa56a8..a171daa 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -32,7 +32,6 @@
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif

-#include <linux/devfs_fs_kernel.h>

 #include <linux/err.h>
 #include <linux/device.h>
 #include <linux/efi.h>
 #include <linux/err.h>
 #include <linux/device.h>
 #include <linux/efi.h>

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 028d9fb..ddb305e 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -12,7 +12,6 @@
 #include <linux/slab.h>
 #include <linux/kmod.h>
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>
 #include <linux/major.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/blkdev.h>
 #include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/blkdev.h>

diff --git a/fs/char_dev.c b/fs/char_dev.c
index f3418f7..9798663 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/seq_file.h>
 
 #include <linux/kobject.h>
 #include <linux/seq_file.h>
 
 #include <linux/kobject.h>

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index aaf6462..803aacf 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/file.h>

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 202f50a..8396340 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -18,7 +18,6 @@
 #include <linux/fs.h>
 #include <linux/kmod.h>
 #include <linux/ctype.h>
 #include <linux/fs.h>
 #include <linux/kmod.h>
 #include <linux/ctype.h>

-#include <linux/devfs_fs_kernel.h>

 
 #include "check.h"
 
 
 #include "check.h"
 

diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h
index 3be5d76..16dbc7d 100644 (file)
--- a/include/asm-ppc/ocp.h
+++ b/include/asm-ppc/ocp.h
@@ -26,7 +26,6 @@
 
 #include <linux/init.h>
 #include <linux/list.h>
 
 #include <linux/init.h>
 #include <linux/list.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/device.h>
 
 #include <asm/mmu.h>
 #include <linux/device.h>
 
 #include <asm/mmu.h>

diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
deleted file mode 100644 (file)
index 2036d2e..0000000
--- a/include/linux/devfs_fs_kernel.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LINUX_DEVFS_FS_KERNEL_H
-#define _LINUX_DEVFS_FS_KERNEL_H
-
-#include <linux/fs.h>
-#include <linux/spinlock.h>
-#include <linux/types.h>
-#include <asm/semaphore.h>
-
-#endif                         /*  _LINUX_DEVFS_FS_KERNEL_H  */

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 07a08e9..b45928f 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -380,7 +380,6 @@ struct fb_cursor {
 #include <linux/tty.h>
 #include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/tty.h>
 #include <linux/device.h>
 #include <linux/workqueue.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/notifier.h>
 #include <linux/list.h>
 #include <asm/io.h>
 #include <linux/notifier.h>
 #include <linux/list.h>
 #include <asm/io.h>

diff --git a/init/do_mounts.h b/init/do_mounts.h
index 66548ef..e7f2e7f 100644 (file)
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -1,6 +1,5 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/config.h>
 #include <linux/kernel.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/init.h>
 #include <linux/syscalls.h>
 #include <linux/unistd.h>
 #include <linux/init.h>
 #include <linux/syscalls.h>
 #include <linux/unistd.h>

diff --git a/init/main.c b/init/main.c
index 80af1a5..acbb0b7 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -15,7 +15,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/kernel.h>
 #include <linux/syscalls.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/syscalls.h>
 #include <linux/string.h>

diff --git a/mm/shmem.c b/mm/shmem.c
index a4161ab..3559047 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -26,7 +26,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/mman.h>

diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index 11ab99b..5f2cbf0 100644 (file)
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -12,7 +12,6 @@
 
 #include <linux/fs.h>
 #include <linux/init.h>
 
 #include <linux/fs.h>
 #include <linux/init.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/vfs.h>
 #include <linux/mount.h>
 #include <linux/file.h>
 #include <linux/vfs.h>
 #include <linux/mount.h>
 #include <linux/file.h>

diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index e4fe1e8..ad6caba 100644 (file)
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -244,7 +244,6 @@
 #include <linux/skbuff.h>
 #include <linux/tty.h>
 #include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <linux/tty.h>
 #include <linux/proc_fs.h>

-#include <linux/devfs_fs_kernel.h>

 #include <linux/netdevice.h>
 #include <linux/miscdevice.h>
 #include <linux/poll.h>
 #include <linux/netdevice.h>
 #include <linux/miscdevice.h>
 #include <linux/poll.h>