diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-06-26 11:26:28 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 20:58:28 +0400 |
| commit | 22f4a00fd5207a107fb81984f7b4cc09e5047b45 (patch) | |
| tree | d051e758c7a2e509605ee0d699b973f3067ed031 | |
| parent | 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 (diff) | |
| download | linux-22f4a00fd5207a107fb81984f7b4cc09e5047b45.tar.xz | |
[PATCH] fbdev: Remove duplicate #include's
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>
| -rw-r--r-- | drivers/video/fbmem.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbmon.c | 3 | ||||
| -rw-r--r-- | drivers/video/tgafb.c | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 372aa1776827..9bb6763d0cb8 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -34,7 +34,6 @@ #endif #include <linux/devfs_fs_kernel.h> #include <linux/err.h> -#include <linux/kernel.h> #include <linux/device.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 -#include <linux/linux_logo.h> static inline unsigned safe_shift(unsigned d, int n) { diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 53beeb4a9998..fbbcb7156a34 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -29,9 +29,9 @@ #include <linux/tty.h> #include <linux/fb.h> #include <linux/module.h> +#include <linux/pci.h> #include <video/edid.h> #ifdef CONFIG_PPC_OF -#include <linux/pci.h> #include <asm/prom.h> #include <asm/pci-bridge.h> #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__) -#include <linux/pci.h> /* * We need to ensure that the EDID block is only returned for diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c index 7398bd48ba6c..6c2c78ab9827 100644 --- a/drivers/video/tgafb.c +++ b/drivers/video/tgafb.c @@ -26,7 +26,6 @@ #include <linux/selection.h> #include <asm/io.h> #include <video/tgafb.h> -#include <linux/selection.h> /* * Local functions. |