From 4d0091523b3f697f4a27aa02432ac3d86b2400ed Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 23 Apr 2003 04:27:54 -0700
Subject: [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.
---
 include/linux/cdrom.h      | 2 +-
 include/linux/fb.h         | 1 -
 include/linux/genhd.h      | 5 +----
 include/linux/input.h      | 1 -
 include/linux/isdn.h       | 4 ----
 include/linux/miscdevice.h | 2 --
 include/linux/videodev.h   | 1 -
 7 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'include/linux')

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
-- 
cgit v1.2.3