[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm Restore ddc probing ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b81ba49c2e4
branches:  riastradh-drm2
changeset: 788316:4b81ba49c2e4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:13:27 2013 +0000

description:
Restore ddc probing in drm_edid.c now that we have Linux i2c shims.

Also include <linux/string.h> for memchr_inv.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_edid.c |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r dca251d9dd79 -r 4b81ba49c2e4 sys/external/bsd/drm2/dist/drm/drm_edid.c
--- a/sys/external/bsd/drm2/dist/drm/drm_edid.c Wed Jul 24 03:13:03 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_edid.c Wed Jul 24 03:13:27 2013 +0000
@@ -35,6 +35,7 @@
 #include <linux/export.h>
 #include <linux/printk.h>
 #include <linux/device.h>
+#include <linux/string.h>
 #include <asm/byteorder.h>
 #include <drm/drmP.h>
 #include <drm/drm_edid.h>
@@ -258,8 +259,6 @@
 }
 EXPORT_SYMBOL(drm_edid_is_valid);
 
-#ifndef __NetBSD__             /* XXX i2c */
-
 #define DDC_SEGMENT_ADDR 0x30
 /**
  * Get EDID information via I2C.
@@ -440,8 +439,6 @@
 }
 EXPORT_SYMBOL(drm_get_edid);
 
-#endif /* !defined(__NetBSD__) */
-
 /*** EDID parsing ***/
 
 /**