summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbmem.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-26 00:26:28 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:28 -0700
commit22f4a00fd5207a107fb81984f7b4cc09e5047b45 (patch)
treed051e758c7a2e509605ee0d699b973f3067ed031 /drivers/video/fbmem.c
parent31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 (diff)
downloadlinux-22f4a00fd5207a107fb81984f7b4cc09e5047b45.tar.gz
linux-22f4a00fd5207a107fb81984f7b4cc09e5047b45.tar.bz2
linux-22f4a00fd5207a107fb81984f7b4cc09e5047b45.zip
[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>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r--drivers/video/fbmem.c2
1 files changed, 0 insertions, 2 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)
{