[src/netbsd-7]: src/sys/arch/evbarm/awin Fix merge botch in ticket #82

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

details:   https://anonhg.NetBSD.org/src/rev/dc87416d0af6
branches:  netbsd-7
changeset: 798334:dc87416d0af6
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Sep 10 10:10:43 2014 +0000

description:
Fix merge botch in ticket #82

diffstat:

 sys/arch/evbarm/awin/awin_machdep.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r c9980447f89e -r dc87416d0af6 sys/arch/evbarm/awin/awin_machdep.c
--- a/sys/arch/evbarm/awin/awin_machdep.c       Wed Sep 10 09:37:51 2014 +0000
+++ b/sys/arch/evbarm/awin/awin_machdep.c       Wed Sep 10 10:10:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awin_machdep.c,v 1.8.2.2 2014/09/10 09:37:51 martin Exp $ */
+/*     $NetBSD: awin_machdep.c,v 1.8.2.3 2014/09/10 10:10:43 martin Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.8.2.2 2014/09/10 09:37:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.8.2.3 2014/09/10 10:10:43 martin Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -619,7 +619,11 @@
                        prop_dictionary_set_cstring(dict, "hdd5ven", ">PH17");
                        prop_dictionary_set_cstring(dict, "emacpwren", ">PH19");
                }
+#if AWIN_board == AWIN_cubieboard || AWIN_board == AWIN_cubietruck
                prop_dictionary_set_cstring(dict, "mmc0detect", "<PH1");
+#elif AWIN_board == AWIN_bpi
+               prop_dictionary_set_cstring(dict, "mmc0detect", "<PH10");
+#endif
 
                /*
                 * These pins have no connections.