From 2a67f59340a67bd90299bf48d0df068790fac4ad Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 26 Jun 2006 00:26:28 -0700
Subject: [PATCH] --- yaml --- r: 30282 b: refs/heads/master c:
 22f4a00fd5207a107fb81984f7b4cc09e5047b45 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 2 --
 trunk/drivers/video/fbmon.c | 3 +--
 trunk/drivers/video/tgafb.c | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6271711a5250..f05fe8a01eaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0
+refs/heads/master: 22f4a00fd5207a107fb81984f7b4cc09e5047b45
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index 372aa1776827..9bb6763d0cb8 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -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)
 {
diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c
index 53beeb4a9998..fbbcb7156a34 100644
--- a/trunk/drivers/video/fbmon.c
+++ b/trunk/drivers/video/fbmon.c
@@ -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
diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c
index 7398bd48ba6c..6c2c78ab9827 100644
--- a/trunk/drivers/video/tgafb.c
+++ b/trunk/drivers/video/tgafb.c
@@ -26,7 +26,6 @@
 #include <linux/selection.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
-#include <linux/selection.h>
 
 /*
  * Local functions.