[src/trunk]: src/sys/arch/evbarm/beagle fix BEAGLEBONEXM linking

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

details:   https://anonhg.NetBSD.org/src/rev/fbac5e0a9ddd
branches:  trunk
changeset: 784795:fbac5e0a9ddd
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Feb 09 22:11:29 2013 +0000

description:
fix BEAGLEBONEXM linking

diffstat:

 sys/arch/evbarm/beagle/beagle_machdep.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 1e2fda8264a7 -r fbac5e0a9ddd sys/arch/evbarm/beagle/beagle_machdep.c
--- a/sys/arch/evbarm/beagle/beagle_machdep.c   Sat Feb 09 20:48:38 2013 +0000
+++ b/sys/arch/evbarm/beagle/beagle_machdep.c   Sat Feb 09 22:11:29 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: beagle_machdep.c,v 1.35 2013/01/14 11:23:48 jmcneill Exp $ */
+/*     $NetBSD: beagle_machdep.c,v 1.36 2013/02/09 22:11:29 christos Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.35 2013/01/14 11:23:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.36 2013/02/09 22:11:29 christos Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -705,15 +705,14 @@
 static bool
 beagle_read_edid(uint8_t *edid_buf, size_t edid_buflen)
 {
+#if defined(OMAP_3530)
        i2c_tag_t ic = NULL;
        uint8_t reg;
        int error;
 
-#if defined(OMAP_3530)
        /* On Beagleboard, EDID is accessed using I2C2 ("omapiic2"). */
        extern i2c_tag_t omap3_i2c_get_tag(device_t);
        ic = omap3_i2c_get_tag(device_find_by_xname("omapiic2"));
-#endif
 
        if (ic == NULL)
                return false;
@@ -728,6 +727,9 @@
        iic_release_bus(ic, 0);
 
        return error == 0 ? true : false;
+#else
+       return false;
+#endif
 }
 
 void