Module Name: src
Committed By: msaitoh
Date: Mon Nov 25 05:47:13 UTC 2019
Modified Files:
src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #466):
sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.80
"rv" is only used on some boards and only with options DIAGNOSTIC.
So move the declaration into the proper #ifdef block.
To generate a diff of this commit:
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 \
src/sys/arch/evbarm/beagle/beagle_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/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.1 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.2
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.1 Fri Nov 22 15:28:18 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Mon Nov 25 05:47:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.78.2.2 2019/11/25 05:47:13 msaitoh 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.78.2.1 2019/11/22 15:28:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78.2.2 2019/11/25 05:47:13 msaitoh Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1075,7 +1075,6 @@ void
beagle_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
- int rv __diagused;
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
@@ -1170,6 +1169,7 @@ beagle_device_register(device_t self, vo
prop_dictionary_set_int16(dict, "port2-gpio", -1);
#endif
#if defined(OMAP_5430)
+ int rv __diagused;
bus_space_tag_t iot = &omap_bs_tag;
bus_space_handle_t ioh;
omap2_gpio_ctl(80, GPIO_PIN_OUTPUT);
