Module Name: src
Committed By: martin
Date: Wed Sep 10 10:10:43 UTC 2014
Modified Files:
src/sys/arch/evbarm/awin [netbsd-7]: awin_machdep.c
Log Message:
Fix merge botch in ticket #82
To generate a diff of this commit:
cvs rdiff -u -r1.8.2.2 -r1.8.2.3 src/sys/arch/evbarm/awin/awin_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.2 src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.3
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.8.2.2 Wed Sep 10 09:37:51 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Wed Sep 10 10:10:43 2014
@@ -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 @@ awin_device_register(device_t self, void
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.
