Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by j...



details:   https://anonhg.NetBSD.org/src/rev/39af7ca897f6
branches:  netbsd-9
changeset: 964057:39af7ca897f6
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 09 14:14:34 2020 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #1044):

        sys/dev/pci/mpii.c: revision 1.25

make this compile without bio(4)

diffstat:

 sys/dev/pci/mpii.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r f1090a39d45a -r 39af7ca897f6 sys/dev/pci/mpii.c
--- a/sys/dev/pci/mpii.c        Sun Aug 09 14:03:07 2020 +0000
+++ b/sys/dev/pci/mpii.c        Sun Aug 09 14:14:34 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.22 2019/03/11 14:35:22 kardel Exp $ */
+/* $NetBSD: mpii.c,v 1.22.4.1 2020/08/09 14:14:34 martin Exp $ */
 /*     $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $     */
 /*
  * Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.22 2019/03/11 14:35:22 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.22.4.1 2020/08/09 14:14:34 martin Exp $");
 
 #include "bio.h"
 
@@ -244,8 +244,10 @@
        struct workqueue        *sc_evt_ack_wq;
        struct work             sc_evt_ack_work;
 
+#if NBIO > 0
        struct sysmon_envsys    *sc_sme;
        envsys_data_t           *sc_sensors;
+#endif
 };
 
 int    mpii_match(device_t, cfdata_t, void *);



Home | Main Index | Thread Index | Old Index