[PATCH 3/6] xfree86: Disable the DisplayID code

[Adam Jackson]

Unreachable, and incomplete anyway.  Might be nice to finish someday.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 hw/xfree86/ddc/ddc.c         |    4 ++++
 hw/xfree86/ddc/xf86DDC.h     |    2 ++
 hw/xfree86/modes/Makefile.am |    3 ++-
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c
index 614db9b..e31ff10 100644
--- a/hw/xfree86/ddc/ddc.c
+++ b/hw/xfree86/ddc/ddc.c
@@ -228,6 +228,8 @@ xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
     return xf86DoEEDID(scrnIndex, pBus, FALSE);
 }
 
+#if 0
+
 /* XXX write me */
 static void *
 DDC2ReadDisplayID(void)
@@ -285,3 +287,5 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
 
     return tmp;
 }
+
+#endif
diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h
index 448ce8c..b98466c 100644
--- a/hw/xfree86/ddc/xf86DDC.h
+++ b/hw/xfree86/ddc/xf86DDC.h
@@ -48,11 +48,13 @@ extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
 extern _X_EXPORT Bool
 xf86MonitorIsHDMI(xf86MonPtr mon);
 
+#if 0
 extern _X_EXPORT xf86MonPtr
 xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus);
 
 extern _X_EXPORT void
 xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC);
+#endif
 
 extern _X_EXPORT DisplayModePtr
 FindDMTMode(int hsize, int vsize, int refresh, Bool rb);
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 9236426..14e3a1d 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -10,7 +10,6 @@ libxf86modes_la_SOURCES = \
 	xf86Cursors.c \
 	xf86cvt.c \
 	xf86gtf.c \
-	xf86DisplayIDModes.c \
 	xf86EdidModes.c \
 	xf86Modes.c \
 	xf86Modes.h \
@@ -32,4 +31,6 @@ sdk_HEADERS = \
 	xf86RandR12.h \
 	xf86Rename.h
 
+EXTRA_SRCS = xf86DisplayIDModes.c
+
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-- 
1.7.6.4