Skip to contentSkip to conversation

fbdev: Remove duplicate #include's

PATCH New Antonino A. Daplas 1 participant 1 message Apr 22, 2006 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: Remove duplicate #include's

From: Adrian Bunk <[email protected]>

This patch removes 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.

---

 drivers/video/fbmem.c |    2 --
 drivers/video/fbmon.c |    3 +--
 drivers/video/tgafb.c |    1 -
 3 files changed, 1 insertions(+), 5 deletions(-)
drivers/video/fbmem.c +0 -2
index 372aa17..9bb6763 100644
@@ -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)
 {
drivers/video/fbmon.c +1 -2
index 53beeb4..fbbcb71 100644
@@ -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
drivers/video/tgafb.c +0 -1
index 7398bd4..6c2c78a 100644
@@ -26,7 +26,6 @@
 #include <linux/selection.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
-#include <linux/selection.h>
 
 /*
  * Local functions.

-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642