[PATCH] don't include devfs_fs_kernel.h in global headers

Now that devfs_handle_t is gone from all structs there is no
reason to include it in headers.

Fix the fallout by including previously implicit headers and fixing
the drivers that didn't include devfs_fs_kernel.h explicitly.

18 files changed, 13 insertions, 16 deletions

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index ddfe3bb53b32..7bbed8bde191 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -52,6 +52,7 @@
 
 #include <linux/fcntl.h>        /* O_ACCMODE */
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
+#include <linux/devfs_fs_kernel.h>
 
 #include <linux/umem.h>
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index e7ed88e4ac02..83a098708a74 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -22,6 +22,7 @@
 #include <linux/tty.h>
 #include <linux/capability.h>
 #include <linux/smp_lock.h>
+#include <linux/devfs_fs_kernel.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 3e944fe20953..ab7424256431 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -19,8 +19,9 @@
 #include <linux/input.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
+#include <linux/devfs_fs_kernel.h>
 
-struct evdev{
+struct evdev {
 	int exist;
 	int open;
 	int minor;
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1989b14ea552..98371fbb208d 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/device.h>
+#include <linux/devfs_fs_kernel.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("Input core");
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 5854c8c201aa..764ae687eb43 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -26,6 +26,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
+#include <linux/devfs_fs_kernel.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Joystick device interfaces");
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 18d3a9c15a37..37335176ad3e 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -22,6 +22,7 @@
 #include <linux/random.h>
 #include <linux/major.h>
 #include <linux/device.h>
+#include <linux/devfs_fs_kernel.h>
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
 #include <linux/miscdevice.h>
 #endif
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index bc0314045969..05211950ff77 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -41,6 +41,7 @@
 #include <linux/random.h>
 #include <linux/time.h>
 #include <linux/device.h>
+#include <linux/devfs_fs_kernel.h>
 
 #ifndef CONFIG_INPUT_TSDEV_SCREEN_X
 #define CONFIG_INPUT_TSDEV_SCREEN_X	240
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 67a6ae6b4df9..497780674a58 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -28,6 +28,7 @@
 #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/semaphore.h>
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 3b6cc6268f8a..8b5d4d5e7e00 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -52,6 +52,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
+#include <linux/devfs_fs_kernel.h>
 
 #define __KERNEL_SYSCALLS__
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 4042fed38527..30b4a6480db3 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -55,6 +55,7 @@ static int sg_version_num = 30528;	/* 2 digits for each component */
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
 #include <linux/moduleparam.h>
+#include <linux/devfs_fs_kernel.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h
index 078a0d7d36fa..0fe8c1f96b14 100644
--- a/include/asm-ppc/ocp.h
+++ b/include/asm-ppc/ocp.h
@@ -36,7 +36,6 @@
 #include <linux/list.h>
 #include <linux/config.h>
 #include <linux/device.h>
-#include <linux/devfs_fs_kernel.h>
 
 #include <asm/ocp_ids.h>
 #include <asm/mmu.h>		/* For phys_addr_t */
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 6581e3c2e8ed..3fb8581cde52 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -715,7 +715,7 @@ struct request_sense {
 };
 
 #ifdef __KERNEL__
-#include <linux/devfs_fs_kernel.h>
+#include <linux/fs.h>		/* not really needed, later.. */
 #include <linux/device.h>
 
 struct cdrom_write_settings {
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 9c1612ce0710..b4e2dbcb8212 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -348,7 +348,6 @@ struct fb_pixmap {
 
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 
 struct fb_info;
 struct vm_area_struct;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index ac8fc9ef5bdb..096643e667ae 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/smp.h>
 #include <linux/string.h>
+#include <linux/fs.h>
 
 enum {
 /* These three have identical behaviour; use the second one if DOS FDISK gets
@@ -55,10 +56,6 @@ struct partition {
 } __attribute__((packed));
 
 #ifdef __KERNEL__
-#include <linux/devfs_fs_kernel.h>	/* we don't need any devfs crap
-					   here, but some of the implicitly
-					   included headers.   will clean
-					   this mess up later.	--hch */
 struct hd_struct {
 	sector_t start_sect;
 	sector_t nr_sects;
diff --git a/include/linux/input.h b/include/linux/input.h
index ca2f6f6b2d1e..da22fe6ccc44 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -734,7 +734,6 @@ struct ff_effect {
  * In-kernel definitions.
  */
 
-#include <linux/devfs_fs_kernel.h>
 #include <linux/fs.h>
 #include <linux/timer.h>
 
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 3715eff60725..a54091f5ff89 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -201,10 +201,6 @@ typedef struct {
 #  include <linux/concap.h>
 #endif
 
-#ifdef CONFIG_DEVFS_FS
-#  include <linux/devfs_fs_kernel.h>
-#endif
-
 #include <linux/isdnif.h>
 
 #define ISDN_DRVIOCTL_MASK       0x7f  /* Mask for Device-ioctl */
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index c8b70414ebf6..159f8ab3df80 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_MISCDEVICE_H
 #define _LINUX_MISCDEVICE_H
 
-#include <linux/devfs_fs_kernel.h>
-
 #define BUSMOUSE_MINOR 0
 #define PSMOUSE_MINOR  1
 #define MS_BUSMOUSE_MINOR 2
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 6c684a84142b..abd1f8ad3b98 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -19,7 +19,6 @@
 #ifdef __KERNEL__
 
 #include <linux/poll.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/mm.h>
 
 struct video_device