Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22f4a00f authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 31c5cdba

drivers/video/fbmem.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

drivers/video/fbmon.c

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/video/tgafb.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/selection.h>

#include <asm/io.h>

#include <video/tgafb.h>

#include <linux/selection.h>



/*

 * Local functions.