[patch] CONFIG_ACPI_VIDEO build failure patch

acpi_video_build_failure.patch (text/plain), 985 bytes, created by Stratos Psomadakis (RETIRED) on 2011-06-22 13:19:18 UTC

 drivers/gpu/drm/nouveau/nouveau_drv.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 9c56331..23c6540 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -973,8 +973,12 @@ void nouveau_register_dsm_handler(void);
 void nouveau_unregister_dsm_handler(void);
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
 bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
+#if defined(CONFIG_ACPI_VIDEO)
 int nouveau_acpi_edid(struct drm_device *, struct drm_connector *);
 #else
+static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return -EINVAL; }
+#endif
+#else
 static inline void nouveau_register_dsm_handler(void) {}
 static inline void nouveau_unregister_dsm_handler(void) {}
 static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; }