summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorleo <leo@NetBSD.org>1998-06-11 08:29:33 +0000
committerleo <leo@NetBSD.org>1998-06-11 08:29:33 +0000
commitd30382ffb4ce3fd7c4c5c462fd7013de4f7a5a10 (patch)
tree7f52fc5b04a79c786f354364e2415a8fdd765794 /sys/dev
parentffa2165350d45e06cb22ad656420f4dc67c2b682 (diff)
Don't call isa_dmainit() when NISADMA == 0.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/isa.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index ea885df8118..914399bfde4 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa.c,v 1.101 1998/06/09 00:00:21 thorpej Exp $ */
+/* $NetBSD: isa.c,v 1.102 1998/06/11 08:29:33 leo Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles Hannum. All rights reserved.
@@ -42,6 +42,8 @@
#include <dev/isa/isavar.h>
#include <dev/isa/isadmareg.h>
+#include "isadma.h"
+
int isamatch __P((struct device *, struct cfdata *, void *));
void isaattach __P((struct device *, struct device *, void *));
int isaprint __P((void *, const char *));
@@ -84,10 +86,12 @@ isaattach(parent, self, aux)
sc->sc_dmat = iba->iba_dmat;
sc->sc_ic = iba->iba_ic;
+#if NISADMA > 0
/*
* Initialize our DMA state.
*/
isa_dmainit(sc->sc_ic, sc->sc_iot, sc->sc_dmat, self);
+#endif
TAILQ_INIT(&sc->sc_subdevs);