diff options
| -rw-r--r-- | arch/i386/boot/compressed/misc.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbmon.c | 1 | ||||
| -rw-r--r-- | drivers/video/vesafb.c | 3 | ||||
| -rw-r--r-- | include/video/edid.h | 9 |
4 files changed, 0 insertions, 14 deletions
diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c index fa67045234a3..cedc55cc47de 100644 --- a/arch/i386/boot/compressed/misc.c +++ b/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/drivers/video/fbmon.c b/drivers/video/fbmon.c index 978def013587..6cd1976548d4 100644 --- a/drivers/video/fbmon.c +++ b/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/drivers/video/vesafb.c b/drivers/video/vesafb.c index 8fc1278d7fbd..3027841f9c24 100644 --- a/drivers/video/vesafb.c +++ b/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/include/video/edid.h b/include/video/edid.h index abc1b489c0db..b913f196131d 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -4,9 +4,6 @@ #ifdef __KERNEL__ #include <linux/config.h> -#ifdef CONFIG_PPC_OF -#include <linux/pci.h> -#endif #ifdef CONFIG_X86 struct edid_info { @@ -14,14 +11,8 @@ struct edid_info { }; 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__ */ |