aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/fbmon.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-26 03:26:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:28 -0400
commit22f4a00fd5207a107fb81984f7b4cc09e5047b45 (patch)
treed051e758c7a2e509605ee0d699b973f3067ed031 /drivers/video/fbmon.c
parent31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 (diff)
[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/fbmon.c')
-rw-r--r--drivers/video/fbmon.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 53beeb4a9998..fbbcb7156a34 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -29,9 +29,9 @@
29#include <linux/tty.h> 29#include <linux/tty.h>
30#include <linux/fb.h> 30#include <linux/fb.h>
31#include <linux/module.h> 31#include <linux/module.h>
32#include <linux/pci.h>
32#include <video/edid.h> 33#include <video/edid.h>
33#ifdef CONFIG_PPC_OF 34#ifdef CONFIG_PPC_OF
34#include <linux/pci.h>
35#include <asm/prom.h> 35#include <asm/prom.h>
36#include <asm/pci-bridge.h> 36#include <asm/pci-bridge.h>
37#endif 37#endif
@@ -1282,7 +1282,6 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
1282} 1282}
1283 1283
1284#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__) 1284#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__)
1285#include <linux/pci.h>
1286 1285
1287/* 1286/*
1288 * We need to ensure that the EDID block is only returned for 1287 * We need to ensure that the EDID block is only returned for