libata: move ata_pci_default_filter() out of CONFIG_PCI

[~andy/linux] / include / video / edid.h

diff --git a/include/video/edid.h b/include/video/edid.h
index abc1b489c0dbbb3e3df9630d2686ea93935579e0..928c342b33d65040be5d2bfd958447d21074e92f 100644 (file)
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -1,27 +1,16 @@
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 
-#ifdef __KERNEL__
-
-#include <linux/config.h>
-#ifdef CONFIG_PPC_OF
-#include <linux/pci.h>
-#endif
+#if !defined(__KERNEL__) || defined(CONFIG_X86)
 
-#ifdef CONFIG_X86
 struct edid_info {
        unsigned char dummy[128];
 };
 
+#ifdef __KERNEL__
 extern struct edid_info edid_info;
-extern char *get_EDID_from_BIOS(void *);
-
-#endif /* CONFIG_X86 */
+#endif /* __KERNEL__ */
 
-#ifdef CONFIG_PPC_OF
-extern char *get_EDID_from_OF(struct pci_dev *pdev);
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif /* __linux_video_edid_h__ */