Source-Changes-HG archive

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

[src/netbsd-1-5]: src/sys/dev/pci Pull up revision 1.8 (requested by abs):



details:   https://anonhg.NetBSD.org/src/rev/1828aa03e908
branches:  netbsd-1-5
changeset: 490310:1828aa03e908
user:      he <he%NetBSD.org@localhost>
date:      Wed Dec 13 23:09:01 2000 +0000

description:
Pull up revision 1.8 (requested by abs):
  Make this build without ``mpu at fms''.

diffstat:

 sys/dev/pci/fms.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 28f318a21b55 -r 1828aa03e908 sys/dev/pci/fms.c
--- a/sys/dev/pci/fms.c Wed Dec 13 22:51:51 2000 +0000
+++ b/sys/dev/pci/fms.c Wed Dec 13 23:09:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $       */
+/*     $NetBSD: fms.c,v 1.5.4.2 2000/12/13 23:09:01 he Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,6 +40,8 @@
  * Forte Media FM801 Audio Device Driver
  */
 
+#include "mpu.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -474,8 +476,10 @@
                        printf("unexpected rec intr\n");
        }
        
+#if NMPU > 0
        if (istat & FM_INTSTATUS_MPU)
                mpu_intr(sc->sc_mpu_dev);
+#endif
 
        bus_space_write_2(sc->sc_iot, sc->sc_ioh, FM_INTSTATUS, 
                          istat & (FM_INTSTATUS_PLAY | FM_INTSTATUS_REC));



Home | Main Index | Thread Index | Old Index