mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 12:37:32 +00:00
Code Issues Releases Wiki Activity

[PATCH] fbdev: Remove duplicate #include's

Browse source 
Remove unneeded duplicate #include's of the same header file.

In the case of fbmon.c linux/pci.h is now #include'd unconditional, but
this should be safe.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk 2006-06-26 00:26:28 -07:00 committed by Linus Torvalds
parent 31c5cdba69
commit 22f4a00fd5
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/fbmem.c
View file

@ -34,7 +34,6 @@
#endif #endif
#include <linux/devfs_fs_kernel.h> #include <linux/devfs_fs_kernel.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/kernel.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/efi.h> #include <linux/efi.h>
@ -162,7 +161,6 @@ char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size
} }
#ifdef CONFIG_LOGO #ifdef CONFIG_LOGO
#include <linux/linux_logo.h>
static inline unsigned safe_shift(unsigned d, int n) static inline unsigned safe_shift(unsigned d, int n)
{ {

3
drivers/video/fbmon.c
View file

@ -29,9 +29,9 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h>
#include <video/edid.h> #include <video/edid.h>
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF
#include <linux/pci.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#endif #endif
@ -1282,7 +1282,6 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
} }
#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__) #if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__)
#include <linux/pci.h>
/* /*
* We need to ensure that the EDID block is only returned for * We need to ensure that the EDID block is only returned for

1
drivers/video/tgafb.c
View file

@ -26,7 +26,6 @@
#include <linux/selection.h> #include <linux/selection.h>
#include <asm/io.h> #include <asm/io.h>
#include <video/tgafb.h> #include <video/tgafb.h>
#include <linux/selection.h>
/* /*
* Local functions. * Local functions.