summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/conf/GENERIC
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-12-10 16:14:23 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-12-10 16:14:23 +0000
commite6d061f3c8691343402c856cf60a7cf4fc04f0c4 (patch)
treea93e1a28971563fb6d8912d9d6e22e0584837818 /sys/arch/sparc/conf/GENERIC
parent9a4ce0926fa2cb418e26650757609de24f07598f (diff)
Allow ``flags 0'' to work to disable DMA for si(4) and sw(4) - it would get
ignored previously.
Diffstat (limited to 'sys/arch/sparc/conf/GENERIC')
-rw-r--r--sys/arch/sparc/conf/GENERIC7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index d1ed844d077..465502156cd 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.88 2006/12/09 20:06:46 miod Exp $
+# $OpenBSD: GENERIC,v 1.89 2006/12/10 16:14:20 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -222,15 +222,14 @@ xy* at xyc?
# E.g. the following would enable DMA, interrupts, and reselect:
# si0 at vmes0 addr 0xff200000 level 3 vect 0x40 flags 0x07
#
-# By default, DMA is enabled in the driver.
-si0 at vmes0 addr 0xff200000 level 3 vect 0x40
+si0 at vmes0 addr 0xff200000 level 3 vect 0x40 flags 0x01
# NCR5380-based "SCSI Weird" on-board SCSI interface found
# on sun4/100 systems. The flags are the same as the "si"
# controller. Note, while DMA is enabled by default, only
# polled DMA works at this time, and reselects do not work
# on this particular controller.
-sw0 at obio0 addr 0x0a000000 level 3
+sw0 at obio0 addr 0x0a000000 level 3 flags 0x01
# Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
# systems.