summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-02-20 06:12:15 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-02-20 06:12:15 +0000
commit102db1f680fada895630fb06cd78df016cc42e2a (patch)
treef51ef86427983f2edaca8e30ab8fd95c37adbc12 /sys
parent497a32bfca51ca7a092a7ab606cd96342315f5ec (diff)
controler -> controller
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/include/smbiosvar.h6
-rw-r--r--sys/arch/arm64/include/smbiosvar.h6
-rw-r--r--sys/arch/i386/include/smbiosvar.h6
-rw-r--r--sys/arch/luna88k/luna88k/autoconf.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/amd64/include/smbiosvar.h b/sys/arch/amd64/include/smbiosvar.h
index 4cfd015d56f..d08c73984d3 100644
--- a/sys/arch/amd64/include/smbiosvar.h
+++ b/sys/arch/amd64/include/smbiosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbiosvar.h,v 1.11 2019/08/04 16:15:57 kmos Exp $ */
+/* $OpenBSD: smbiosvar.h,v 1.12 2020/02/20 06:12:14 jsg Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
* Copyright (c) 2005 Jordan Hargrave
@@ -150,8 +150,8 @@ struct smbios_struct_bios {
uint32_t charext;
uint8_t major_rel;
uint8_t minor_rel;
- uint8_t ecf_mjr_rel; /* embedded controler firmware */
- uint8_t ecf_min_rel; /* embedded controler firmware */
+ uint8_t ecf_mjr_rel; /* embedded controller firmware */
+ uint8_t ecf_min_rel; /* embedded controller firmware */
} __packed;
/*
diff --git a/sys/arch/arm64/include/smbiosvar.h b/sys/arch/arm64/include/smbiosvar.h
index 40b3ea20f5d..822f420a8fa 100644
--- a/sys/arch/arm64/include/smbiosvar.h
+++ b/sys/arch/arm64/include/smbiosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbiosvar.h,v 1.3 2019/08/04 16:15:58 kmos Exp $ */
+/* $OpenBSD: smbiosvar.h,v 1.4 2020/02/20 06:12:14 jsg Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
* Copyright (c) 2005 Jordan Hargrave
@@ -147,8 +147,8 @@ struct smbios_struct_bios {
uint32_t charext;
uint8_t major_rel;
uint8_t minor_rel;
- uint8_t ecf_mjr_rel; /* embedded controler firmware */
- uint8_t ecf_min_rel; /* embedded controler firmware */
+ uint8_t ecf_mjr_rel; /* embedded controller firmware */
+ uint8_t ecf_min_rel; /* embedded controller firmware */
} __packed;
/*
diff --git a/sys/arch/i386/include/smbiosvar.h b/sys/arch/i386/include/smbiosvar.h
index 8b3c7a4e8e4..d08c73984d3 100644
--- a/sys/arch/i386/include/smbiosvar.h
+++ b/sys/arch/i386/include/smbiosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbiosvar.h,v 1.11 2019/08/04 16:15:58 kmos Exp $ */
+/* $OpenBSD: smbiosvar.h,v 1.12 2020/02/20 06:12:14 jsg Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
* Copyright (c) 2005 Jordan Hargrave
@@ -150,8 +150,8 @@ struct smbios_struct_bios {
uint32_t charext;
uint8_t major_rel;
uint8_t minor_rel;
- uint8_t ecf_mjr_rel; /* embedded controler firmware */
- uint8_t ecf_min_rel; /* embedded controler firmware */
+ uint8_t ecf_mjr_rel; /* embedded controller firmware */
+ uint8_t ecf_min_rel; /* embedded controller firmware */
} __packed;
/*
diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c
index 1dcbf5171ff..e4b6c7c1fb3 100644
--- a/sys/arch/luna88k/luna88k/autoconf.c
+++ b/sys/arch/luna88k/luna88k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.23 2018/01/27 22:55:23 naddy Exp $ */
+/* $OpenBSD: autoconf.c,v 1.24 2020/02/20 06:12:14 jsg Exp $ */
/*
* Copyright (c) 1998 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -124,7 +124,7 @@ get_autoboot_device(void)
/* Assume default controller is internal spc (spc0) */
strlcpy(autoboot.cont, "spc0", sizeof(autoboot.cont));
- /* Get boot controler and SCSI target from NVRAM */
+ /* Get boot controller and SCSI target from NVRAM */
value = nvram_by_symbol("boot_unit");
if (value != NULL) {
len = strlen(value);