drivers/video/: remove duplicate #include's
PATCH 1/1 drivers/video/: remove duplicate #include's
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.
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/video/fbmem.c | 2 -- drivers/video/fbmon.c | 3 +-- drivers/video/tgafb.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/video/fbmem.c renamed from drivers/video/fbmem.c.old +0 -2
@@ -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 @@ }#ifdef CONFIG_LOGO -#include <linux/linux_logo.h> static inline unsigned safe_shift (unsigned d,int n) {
drivers/video/fbmon.c renamed from drivers/video/fbmon.c.old +1 -2
@@ -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 @@ }#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 renamed from drivers/video/tgafb.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/selection.h> #include <asm/io.h> #include <video/tgafb.h> -#include <linux/selection.h> /* * Local functions.