Module Name: src
Committed By: msaitoh
Date: Wed Aug 21 04:17:41 UTC 2019
Modified Files:
src/sys/arch/alpha/conf: files.alpha
src/sys/arch/evbarm/conf: CP3100 GUMSTIX TWINTAIL
src/sys/arch/evbmips/conf: files.sbmips
src/sys/arch/hpcarm/conf: NETBOOKPRO WZERO3
src/sys/arch/hpcmips/conf: files.hpcmips
src/sys/arch/hpcmips/dev: mq200subr.c
src/sys/arch/mips/atheros/dev: ehci_arbus.c
src/sys/arch/pmax/pmax: memc_3min.c
src/sys/arch/powerpc/booke/dev: pq3ehci.c
src/sys/arch/sbmips/conf: files.sbmips
src/sys/arch/shark/shark: i8042.c
src/sys/arch/sparc/include: intr.h
src/sys/arch/zaurus/conf: GENERIC
src/sys/dev/mvme: memcvar.h
Log Message:
Fix typo (s/contoller/controller/).
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/CP3100
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/files.sbmips
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcarm/conf/NETBOOKPRO
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/hpcmips/conf/files.hpcmips
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/dev/mq200subr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/atheros/dev/ehci_arbus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/pmax/pmax/memc_3min.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sbmips/conf/files.sbmips
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/shark/shark/i8042.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/include/intr.h
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mvme/memcvar.h
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/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.190 src/sys/arch/alpha/conf/files.alpha:1.191
--- src/sys/arch/alpha/conf/files.alpha:1.190 Mon Mar 25 19:24:30 2019
+++ src/sys/arch/alpha/conf/files.alpha Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.190 2019/03/25 19:24:30 maxv Exp $
+# $NetBSD: files.alpha,v 1.191 2019/08/21 04:17:40 msaitoh Exp $
#
# alpha-specific configuration info
@@ -443,7 +443,7 @@ include "compat/ossaudio/files.ossaudio"
# needs to be before its isa and pci attachments. This answer is
# non-optimal, but I don't have a better answer right now.
-# PCIC pcmcia contoller
+# PCIC pcmcia controller
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
Index: src/sys/arch/evbarm/conf/CP3100
diff -u src/sys/arch/evbarm/conf/CP3100:1.48 src/sys/arch/evbarm/conf/CP3100:1.49
--- src/sys/arch/evbarm/conf/CP3100:1.48 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/evbarm/conf/CP3100 Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CP3100,v 1.48 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: CP3100,v 1.49 2019/08/21 04:17:40 msaitoh Exp $
#
# CP3100 -- Certance CP3100 Kernel
#
@@ -160,7 +160,7 @@ wd* at atabus? drive ? flags 0x0000
# SCSI: Symbios Logic 53c1010
#
-# Wire down the Target/Host instances. Disable the target contoller for
+# Wire down the Target/Host instances. Disable the target controller for
# now as we don't currently support SCSI target mode.
siop0 at pci0 dev 2 function 1 # Host controller
#siop1 at pci0 dev 2 function 0 # Target controller
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.100 src/sys/arch/evbarm/conf/GUMSTIX:1.101
--- src/sys/arch/evbarm/conf/GUMSTIX:1.100 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/evbarm/conf/GUMSTIX Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.100 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GUMSTIX,v 1.101 2019/08/21 04:17:40 msaitoh Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -196,7 +196,7 @@ ohci0 at pxaip? addr 0x4c000000 intr 3 #
# ALSO NEEDS pxaudc
pxaudc0 at pxaip? addr 0x40600000
-# integrated MMC/SD contoller
+# integrated MMC/SD controller
pxamci0 at pxaip? addr 0x41100000 size 0x48
sdmmc* at pxamci?
#options PXAMCI_DEBUG
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.74 src/sys/arch/evbarm/conf/TWINTAIL:1.75
--- src/sys/arch/evbarm/conf/TWINTAIL:1.74 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/TWINTAIL Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.74 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: TWINTAIL,v 1.75 2019/08/21 04:17:40 msaitoh Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -342,7 +342,7 @@ options PXA2X0_DMAC_DMOVER_CONCURRENCY=
#options PXA2X0_DMAC_FIXED_PRIORITY # Don't want multiple priority
-# MMC/SD contoller in PXA255
+# MMC/SD controller in PXA255
# (attached on obio for card detect and write protect signal)
pxamci0 at obio?
sdmmc* at pxamci?
Index: src/sys/arch/evbmips/conf/files.sbmips
diff -u src/sys/arch/evbmips/conf/files.sbmips:1.3 src/sys/arch/evbmips/conf/files.sbmips:1.4
--- src/sys/arch/evbmips/conf/files.sbmips:1.3 Thu Apr 11 02:01:53 2019
+++ src/sys/arch/evbmips/conf/files.sbmips Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbmips,v 1.3 2019/04/11 02:01:53 simonb Exp $
+# $NetBSD: files.sbmips,v 1.4 2019/08/21 04:17:40 msaitoh Exp $
maxpartitions 8
@@ -58,7 +58,7 @@ file arch/alpha/isa/isapnp_machdep.c isa
# needs to be before its isa and pci attachments. This answer is
# non-optimal, but I don't have a better answer right now.
-# PCIC pcmcia contoller
+# PCIC pcmcia controller
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
Index: src/sys/arch/hpcarm/conf/NETBOOKPRO
diff -u src/sys/arch/hpcarm/conf/NETBOOKPRO:1.28 src/sys/arch/hpcarm/conf/NETBOOKPRO:1.29
--- src/sys/arch/hpcarm/conf/NETBOOKPRO:1.28 Sun Apr 14 04:16:32 2019
+++ src/sys/arch/hpcarm/conf/NETBOOKPRO Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NETBOOKPRO,v 1.28 2019/04/14 04:16:32 isaki Exp $
+# $NetBSD: NETBOOKPRO,v 1.29 2019/08/21 04:17:40 msaitoh Exp $
#
# NETBOOKPRO -- Psion Teklogix NETBOOK PRO
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.netbookp
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.28 $"
+#ident "GENERIC-$Revision: 1.29 $"
# estimated number of users
maxusers 32
@@ -187,7 +187,7 @@ nbpkbd* at nbppcon? tag 0x00
hpckbd* at nbpkbd?
wskbd0 at hpckbd? mux 1
-# integrated MMC/SD contoller
+# integrated MMC/SD controller
pxamci0 at pxaip? addr 0x41100000
sdmmc* at pxamci?
ld* at sdmmc? # MMC/SD/SDHC card
Index: src/sys/arch/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.49 src/sys/arch/hpcarm/conf/WZERO3:1.50
--- src/sys/arch/hpcarm/conf/WZERO3:1.49 Fri Apr 26 21:40:30 2019
+++ src/sys/arch/hpcarm/conf/WZERO3 Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: WZERO3,v 1.49 2019/04/26 21:40:30 sevan Exp $
+# $NetBSD: WZERO3,v 1.50 2019/08/21 04:17:40 msaitoh Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.49 $"
+#ident "GENERIC-$Revision: 1.50 $"
# estimated number of users
maxusers 32
@@ -188,7 +188,7 @@ wskbd0 at hpckbd? mux 1
wzero3keypad0 at pxaip?
wskbd1 at wzero3keypad? mux 1
-# integrated MMC/SD contoller
+# integrated MMC/SD controller
pxamci0 at pxaip? addr 0x41100000 size 0x48
sdmmc* at pxamci?
ld* at sdmmc? # MMC/SD/SDHC card
Index: src/sys/arch/hpcmips/conf/files.hpcmips
diff -u src/sys/arch/hpcmips/conf/files.hpcmips:1.108 src/sys/arch/hpcmips/conf/files.hpcmips:1.109
--- src/sys/arch/hpcmips/conf/files.hpcmips:1.108 Sun Jul 20 10:22:54 2014
+++ src/sys/arch/hpcmips/conf/files.hpcmips Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.108 2014/07/20 10:22:54 alnsn Exp $
+# $NetBSD: files.hpcmips,v 1.109 2019/08/21 04:17:40 msaitoh Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -392,7 +392,7 @@ file arch/i386/isa/fd.c fdc needs-flag
# needs to be before its isa and pci attachments. This answer is
# non-optimal, but I don't have a better answer right now.
-# PCIC pcmcia contoller
+# PCIC pcmcia controller
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
Index: src/sys/arch/hpcmips/dev/mq200subr.c
diff -u src/sys/arch/hpcmips/dev/mq200subr.c:1.6 src/sys/arch/hpcmips/dev/mq200subr.c:1.7
--- src/sys/arch/hpcmips/dev/mq200subr.c:1.6 Sun Dec 11 12:17:33 2005
+++ src/sys/arch/hpcmips/dev/mq200subr.c Wed Aug 21 04:17:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mq200subr.c,v 1.6 2005/12/11 12:17:33 christos Exp $ */
+/* $NetBSD: mq200subr.c,v 1.7 2019/08/21 04:17:40 msaitoh Exp $ */
/*-
* Copyright (c) 2001 TAKEMURA Shin
@@ -31,7 +31,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mq200subr.c,v 1.6 2005/12/11 12:17:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mq200subr.c,v 1.7 2019/08/21 04:17:40 msaitoh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -258,7 +258,7 @@ mq200_setup(struct mq200_softc *sc)
DPRINTF(" GE: PLL%d\n", clock->ge);
/*
- * setup GC1 (CRT contoller)
+ * setup GC1 (CRT controller)
*/
if (sc->sc_flags & MQ200_SC_GC1_ENABLE) {
/* GC03R Horizontal Display Control */
@@ -304,7 +304,7 @@ mq200_setup(struct mq200_softc *sc)
/* busy wait */;
/*
- * setup GC2 (FP contoller)
+ * setup GC2 (FP controller)
*/
if (sc->sc_flags & MQ200_SC_GC2_ENABLE) {
//mq200_write(sc, MQ200_GCCR(MQ200_GC2),
Index: src/sys/arch/mips/atheros/dev/ehci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.7 src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.8
--- src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.7 Tue Jul 12 17:04:21 2016
+++ src/sys/arch/mips/atheros/dev/ehci_arbus.c Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_arbus.c,v 1.7 2016/07/12 17:04:21 maya Exp $ */
+/* $NetBSD: ehci_arbus.c,v 1.8 2019/08/21 04:17:41 msaitoh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.7 2016/07/12 17:04:21 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.8 2019/08/21 04:17:41 msaitoh Exp $");
#include "locators.h"
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c
#include <dev/usb/ehcivar.h>
/*
- * This is relative to the start of the unreserved registers in USB contoller
+ * This is relative to the start of the unreserved registers in USB controller
* block and not the full USB block which would be 0x1a8.
*/
#define ARBUS_USBMODE 0xa8 /* USB mode */
Index: src/sys/arch/pmax/pmax/memc_3min.c
diff -u src/sys/arch/pmax/pmax/memc_3min.c:1.14 src/sys/arch/pmax/pmax/memc_3min.c:1.15
--- src/sys/arch/pmax/pmax/memc_3min.c:1.14 Tue Feb 8 20:20:22 2011
+++ src/sys/arch/pmax/pmax/memc_3min.c Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: memc_3min.c,v 1.14 2011/02/08 20:20:22 rmind Exp $ */
+/* $NetBSD: memc_3min.c,v 1.15 2019/08/21 04:17:41 msaitoh Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,10 +39,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memc_3min.c,v 1.14 2011/02/08 20:20:22 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memc_3min.c,v 1.15 2019/08/21 04:17:41 msaitoh Exp $");
/*
- * Motherboard memory error contoller used in both
+ * Motherboard memory error controller used in both
* 3min (kn02ba) and maxine (kn02ca).
*/
Index: src/sys/arch/powerpc/booke/dev/pq3ehci.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.8 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.9
--- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.8 Sat Apr 23 10:15:30 2016
+++ src/sys/arch/powerpc/booke/dev/pq3ehci.c Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3ehci.c,v 1.8 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: pq3ehci.c,v 1.9 2019/08/21 04:17:41 msaitoh Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.8 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.9 2019/08/21 04:17:41 msaitoh Exp $");
#include "opt_usb.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v
#include <dev/usb/ehcivar.h>
/*
- * This is relative to the start of the unreserved registers in USB contoller
+ * This is relative to the start of the unreserved registers in USB controller
* block and not the full USB block which would be 0x1a8.
*/
#define PQ3_USBMODE 0xa8 /* USB mode */
Index: src/sys/arch/sbmips/conf/files.sbmips
diff -u src/sys/arch/sbmips/conf/files.sbmips:1.16 src/sys/arch/sbmips/conf/files.sbmips:1.17
--- src/sys/arch/sbmips/conf/files.sbmips:1.16 Sun Jul 20 10:22:55 2014
+++ src/sys/arch/sbmips/conf/files.sbmips Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbmips,v 1.16 2014/07/20 10:22:55 alnsn Exp $
+# $NetBSD: files.sbmips,v 1.17 2019/08/21 04:17:41 msaitoh Exp $
maxpartitions 8
@@ -59,7 +59,7 @@ file arch/alpha/isa/isapnp_machdep.c isa
# needs to be before its isa and pci attachments. This answer is
# non-optimal, but I don't have a better answer right now.
-# PCIC pcmcia contoller
+# PCIC pcmcia controller
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
Index: src/sys/arch/shark/shark/i8042.c
diff -u src/sys/arch/shark/shark/i8042.c:1.6 src/sys/arch/shark/shark/i8042.c:1.7
--- src/sys/arch/shark/shark/i8042.c:1.6 Tue Jul 19 15:07:43 2011
+++ src/sys/arch/shark/shark/i8042.c Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i8042.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $ */
+/* $NetBSD: i8042.c,v 1.7 2019/08/21 04:17:41 msaitoh Exp $ */
/*
* Copyright 1997
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8042.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8042.c,v 1.7 2019/08/21 04:17:41 msaitoh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -328,7 +328,7 @@ i8042_cmd(bus_space_tag_t iot,
else
{
KERN_DEBUG(i8042debug, KERN_DEBUG_WARNING,
- ("i8042_cmd: failed contoller command byte "
+ ("i8042_cmd: failed controller command byte "
"write request of 0x%x\n",
value));
break;
Index: src/sys/arch/sparc/include/intr.h
diff -u src/sys/arch/sparc/include/intr.h:1.12 src/sys/arch/sparc/include/intr.h:1.13
--- src/sys/arch/sparc/include/intr.h:1.12 Fri Jul 27 05:36:11 2012
+++ src/sys/arch/sparc/include/intr.h Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.12 2012/07/27 05:36:11 matt Exp $ */
+/* $NetBSD: intr.h,v 1.13 2019/08/21 04:17:41 msaitoh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#define IPL_HIGH 15 /* everything */
/*
- * fd hardware, ts102, and tadpole microcontoller interrupts are at level 11
+ * fd hardware, ts102, and tadpole microcontroller interrupts are at level 11
*/
#define IPL_FD IPL_SCHED
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.86 src/sys/arch/zaurus/conf/GENERIC:1.87
--- src/sys/arch/zaurus/conf/GENERIC:1.86 Fri Jul 26 07:09:47 2019
+++ src/sys/arch/zaurus/conf/GENERIC Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.86 2019/07/26 07:09:47 martin Exp $
+# $NetBSD: GENERIC,v 1.87 2019/08/21 04:17:41 msaitoh Exp $
#
# GENERIC machine description file
#
@@ -191,7 +191,7 @@ apmdev0 at zapm0 # APM
scoop0 at pxaip?
scoop1 at pxaip?
-# alternate GPIO contoller for SL-C1000
+# alternate GPIO controller for SL-C1000
ioexp0 at iic? addr 0x18
# ADC, touchpad, backlight
@@ -353,7 +353,7 @@ ukphy* at mii? phy ? # generic unknow
urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
-# integrated MMC/SD contoller
+# integrated MMC/SD controller
pxamci0 at pxaip? addr 0x41100000 size 0x48
sdmmc* at pxamci?
#options PXAMCI_DEBUG
Index: src/sys/dev/mvme/memcvar.h
diff -u src/sys/dev/mvme/memcvar.h:1.3 src/sys/dev/mvme/memcvar.h:1.4
--- src/sys/dev/mvme/memcvar.h:1.3 Sat Oct 27 17:18:27 2012
+++ src/sys/dev/mvme/memcvar.h Wed Aug 21 04:17:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: memcvar.h,v 1.3 2012/10/27 17:18:27 chs Exp $ */
+/* $NetBSD: memcvar.h,v 1.4 2019/08/21 04:17:41 msaitoh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@ struct memc_softc {
#ifdef MVME68K
#define MEMC_IRQ_LEVEL 6
#else
-#error Define irq level for memory contoller
+#error Define irq level for memory controller
#endif
extern void memc_init(struct memc_softc *);
