summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2004-04-12 22:12:33 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2004-04-12 22:12:33 +0000
commita114b148e772e18d9bbaedc06f73fb88daae0b2d (patch)
tree2cd4bf34394ab3edea4b1a160315267c9ddf6387 /sys/dev
parentdbb0678c3779bc4a1dbd6d603e68903e3bcc4f04 (diff)
removeable -> removable;
ok deraadt@ beck@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/i2o/i2o.h6
-rw-r--r--sys/dev/i2o/ioprbs.c8
-rw-r--r--sys/dev/ic/aic7xxx.h8
-rw-r--r--sys/dev/ic/aic7xxxvar.h8
4 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/i2o/i2o.h b/sys/dev/i2o/i2o.h
index 5f5451fc3ba..aa10b34708e 100644
--- a/sys/dev/i2o/i2o.h
+++ b/sys/dev/i2o/i2o.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i2o.h,v 1.6 2003/10/21 10:32:08 jmc Exp $ */
+/* $OpenBSD: i2o.h,v 1.7 2004/04/12 22:12:32 jmc Exp $ */
/* $NetBSD: i2o.h,v 1.3 2001/03/20 13:01:48 ad Exp $ */
/*-
@@ -841,8 +841,8 @@ struct i2o_param_rbs_device_info {
#define I2O_RBS_CAP_CACHING 0x00000001
#define I2O_RBS_CAP_MULTI_PATH 0x00000002
#define I2O_RBS_CAP_DYNAMIC_CAPACITY 0x00000004
-#define I2O_RBS_CAP_REMOVEABLE_MEDIA 0x00000008
-#define I2O_RBS_CAP_REMOVEABLE_DEVICE 0x00000010
+#define I2O_RBS_CAP_REMOVABLE_MEDIA 0x00000008
+#define I2O_RBS_CAP_REMOVABLE_DEVICE 0x00000010
#define I2O_RBS_CAP_READ_ONLY 0x00000020
#define I2O_RBS_CAP_LOCKOUT 0x00000040
#define I2O_RBS_CAP_BOOT_BYPASS 0x00000080
diff --git a/sys/dev/i2o/ioprbs.c b/sys/dev/i2o/ioprbs.c
index 4c62cb0143f..2e0aa42d27a 100644
--- a/sys/dev/i2o/ioprbs.c
+++ b/sys/dev/i2o/ioprbs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioprbs.c,v 1.4 2003/04/27 11:22:52 ho Exp $ */
+/* $OpenBSD: ioprbs.c,v 1.5 2004/04/12 22:12:32 jmc Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -301,10 +301,10 @@ ioprbs_attach(struct device *parent, struct device *self, void *aux)
break;
}
- if ((letoh32(param.p.bdi.capabilities) & I2O_RBS_CAP_REMOVEABLE_MEDIA)
+ if ((letoh32(param.p.bdi.capabilities) & I2O_RBS_CAP_REMOVABLE_MEDIA)
!= 0) {
- /* sc->sc_flags = IOPRBS_REMOVEABLE; */
- fixedstr = "removeable";
+ /* sc->sc_flags = IOPRBS_REMOVABLE; */
+ fixedstr = "removable";
enable = 0;
} else
fixedstr = "fixed";
diff --git a/sys/dev/ic/aic7xxx.h b/sys/dev/ic/aic7xxx.h
index 98a131df82e..6545681d2c9 100644
--- a/sys/dev/ic/aic7xxx.h
+++ b/sys/dev/ic/aic7xxx.h
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: aic7xxx.h,v 1.10 2004/02/08 00:38:08 krw Exp $
+ * $OpenBSD: aic7xxx.h,v 1.11 2004/04/12 22:12:32 jmc Exp $
* Core definitions and data structures shareable across OS platforms.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: aic7xxx.h,v 1.10 2004/02/08 00:38:08 krw Exp $
+ * $Id: aic7xxx.h,v 1.11 2004/04/12 22:12:32 jmc Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.40 2001/07/18 21:39:47 gibbs Exp $
*/
@@ -792,8 +792,8 @@ struct seeprom_config {
* BIOS Control Bits
*/
uint16_t bios_control; /* word 16 */
-#define CFSUPREM 0x0001 /* support all removeable drives */
-#define CFSUPREMB 0x0002 /* support removeable boot drives */
+#define CFSUPREM 0x0001 /* support all removable drives */
+#define CFSUPREMB 0x0002 /* support removable boot drives */
#define CFBIOSEN 0x0004 /* BIOS enabled */
#define CFBIOS_BUSSCAN 0x0008 /* Have the BIOS Scan the Bus */
#define CFSM2DRV 0x0010 /* support more than two drives */
diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h
index 4533bf3e0c2..67b2d6cefa9 100644
--- a/sys/dev/ic/aic7xxxvar.h
+++ b/sys/dev/ic/aic7xxxvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxxvar.h,v 1.18 2004/01/17 14:40:55 krw Exp $ */
+/* $OpenBSD: aic7xxxvar.h,v 1.19 2004/04/12 22:12:32 jmc Exp $ */
/*
* Core definitions and data structures shareable across OS platforms.
*
@@ -38,7 +38,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxxvar.h,v 1.18 2004/01/17 14:40:55 krw Exp $
+ * $Id: aic7xxxvar.h,v 1.19 2004/04/12 22:12:32 jmc Exp $
*
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.h,v 1.44 2003/01/20 20:44:55 gibbs Exp $
*/
@@ -848,8 +848,8 @@ struct seeprom_config {
* BIOS Control Bits
*/
uint16_t bios_control; /* word 16 */
-#define CFSUPREM 0x0001 /* support all removeable drives */
-#define CFSUPREMB 0x0002 /* support removeable boot drives */
+#define CFSUPREM 0x0001 /* support all removable drives */
+#define CFSUPREMB 0x0002 /* support removable boot drives */
#define CFBIOSEN 0x0004 /* BIOS enabled */
#define CFBIOS_BUSSCAN 0x0008 /* Have the BIOS Scan the Bus */
#define CFSM2DRV 0x0010 /* support more than two drives */