---

yaml --- r: 772 b: refs/heads/master c: 5f76be8 h: refs/heads/master v: v3
git-mirror · May 1, 2005 · 4e005f5 · 4e005f5
1 parent 1c4125c
commit 4e005f5
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 917bb0771aa077f62a3de75028a45f243d3954a8
+refs/heads/master: 5f76be80d96f60adfc91f2acf22b146ce0e3072f
diff --git a/trunk/arch/i386/boot/compressed/misc.c b/trunk/arch/i386/boot/compressed/misc.c
@@ -12,7 +12,6 @@
 #include <linux/linkage.h>
 #include <linux/vmalloc.h>
 #include <linux/tty.h>
-#include <video/edid.h>
 #include <asm/io.h>
 
 /*

diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c
@@ -34,7 +34,6 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
-#include <video/edid.h>
 #include "edid.h"
 
 /* 

diff --git a/trunk/drivers/video/vesafb.c b/trunk/drivers/video/vesafb.c
@@ -19,9 +19,6 @@
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#ifdef __i386__
-#include <video/edid.h>
-#endif
 #include <asm/io.h>
 #include <asm/mtrr.h>
 

diff --git a/trunk/include/video/edid.h b/trunk/include/video/edid.h
@@ -4,24 +4,15 @@
 #ifdef __KERNEL__
 
 #include <linux/config.h>
-#ifdef CONFIG_PPC_OF
-#include <linux/pci.h>
-#endif
 
 #ifdef CONFIG_X86
 struct edid_info {
 	unsigned char dummy[128];
 };
 
 extern struct edid_info edid_info;
-extern char *get_EDID_from_BIOS(void *);
-
 #endif /* CONFIG_X86 */
 
-#ifdef CONFIG_PPC_OF
-extern char *get_EDID_from_OF(struct pci_dev *pdev);
-#endif
-
 #endif /* __KERNEL__ */
 
 #endif /* __linux_video_edid_h__ */