From 4d0091523b3f697f4a27aa02432ac3d86b2400ed Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 23 Apr 2003 04:27:54 -0700 Subject: [PATCH] [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. --- drivers/block/umem.c | 1 + drivers/char/mem.c | 1 + drivers/input/evdev.c | 3 ++- drivers/input/input.c | 1 + drivers/input/joydev.c | 1 + drivers/input/mousedev.c | 1 + drivers/input/tsdev.c | 1 + drivers/media/video/videodev.c | 1 + drivers/scsi/scsi.c | 1 + drivers/scsi/sg.c | 1 + include/asm-ppc/ocp.h | 1 - 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 - 18 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/block/umem.c b/drivers/block/umem.c index ddfe3bb53b329..7bbed8bde191b 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -52,6 +52,7 @@ #include /* O_ACCMODE */ #include /* HDIO_GETGEO */ +#include #include diff --git a/drivers/char/mem.c b/drivers/char/mem.c index e7ed88e4ac020..83a098708a74a 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 3e944fe20953f..ab7424256431a 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -19,8 +19,9 @@ #include #include #include +#include -struct evdev{ +struct evdev { int exist; int open; int minor; diff --git a/drivers/input/input.c b/drivers/input/input.c index 1989b14ea552e..98371fbb208d3 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -22,6 +22,7 @@ #include #include #include +#include MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("Input core"); diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 5854c8c201aa9..764ae687eb43f 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -26,6 +26,7 @@ #include #include #include +#include MODULE_AUTHOR("Vojtech Pavlik "); MODULE_DESCRIPTION("Joystick device interfaces"); diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 18d3a9c15a375..37335176ad3ee 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX #include #endif diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c index bc03140459699..05211950ff77f 100644 --- a/drivers/input/tsdev.c +++ b/drivers/input/tsdev.c @@ -41,6 +41,7 @@ #include #include #include +#include #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 67a6ae6b4df93..497780674a58c 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 3b6cc6268f8ad..8b5d4d5e7e005 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -52,6 +52,7 @@ #include #include #include +#include #define __KERNEL_SYSCALLS__ diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 4042fed385270..30b4a6480db37 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 #include #include +#include #include #include diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 078a0d7d36fa9..0fe8c1f96b141 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include /* For phys_addr_t */ diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 6581e3c2e8ed0..3fb8581cde52a 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -715,7 +715,7 @@ struct request_sense { }; #ifdef __KERNEL__ -#include +#include /* not really needed, later.. */ #include struct cdrom_write_settings { diff --git a/include/linux/fb.h b/include/linux/fb.h index 9c1612ce07102..b4e2dbcb82126 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -348,7 +348,6 @@ struct fb_pixmap { #include #include -#include struct fb_info; struct vm_area_struct; diff --git a/include/linux/genhd.h b/include/linux/genhd.h index ac8fc9ef5bdb0..096643e667ae0 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -15,6 +15,7 @@ #include #include #include +#include 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 /* 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 ca2f6f6b2d1ed..da22fe6ccc442 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -734,7 +734,6 @@ struct ff_effect { * In-kernel definitions. */ -#include #include #include diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 3715eff607259..a54091f5ff89e 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -201,10 +201,6 @@ typedef struct { # include #endif -#ifdef CONFIG_DEVFS_FS -# include -#endif - #include #define ISDN_DRVIOCTL_MASK 0x7f /* Mask for Device-ioctl */ diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index c8b70414ebf6f..159f8ab3df80e 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -1,8 +1,6 @@ #ifndef _LINUX_MISCDEVICE_H #define _LINUX_MISCDEVICE_H -#include - #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 6c684a84142b6..abd1f8ad3b987 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -19,7 +19,6 @@ #ifdef __KERNEL__ #include -#include #include struct video_device -- 2.53.0