From: Adrian Bunk <bunk@stusta.de>

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>
---

 drivers/video/fbmem.c |    2 --
 drivers/video/fbmon.c |    3 +--
 drivers/video/tgafb.c |    1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff -puN drivers/video/fbmem.c~fbdev-remove-duplicate-includes drivers/video/fbmem.c
--- devel/drivers/video/fbmem.c~fbdev-remove-duplicate-includes	2006-05-17 13:10:19.000000000 -0700
+++ devel-akpm/drivers/video/fbmem.c	2006-05-17 13:10:19.000000000 -0700
@@ -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_inf
 }
 
 #ifdef CONFIG_LOGO
-#include <linux/linux_logo.h>
 
 static inline unsigned safe_shift(unsigned d, int n)
 {
diff -puN drivers/video/fbmon.c~fbdev-remove-duplicate-includes drivers/video/fbmon.c
--- devel/drivers/video/fbmon.c~fbdev-remove-duplicate-includes	2006-05-17 13:10:19.000000000 -0700
+++ devel-akpm/drivers/video/fbmon.c	2006-05-17 13:10:19.000000000 -0700
@@ -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
 }
 
 #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 -puN drivers/video/tgafb.c~fbdev-remove-duplicate-includes drivers/video/tgafb.c
--- devel/drivers/video/tgafb.c~fbdev-remove-duplicate-includes	2006-05-17 13:10:19.000000000 -0700
+++ devel-akpm/drivers/video/tgafb.c	2006-05-17 13:10:19.000000000 -0700
@@ -26,7 +26,6 @@
 #include <linux/selection.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
-#include <linux/selection.h>
 
 /*
  * Local functions.
_