summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/luna88k/dev/siotty.c4
-rw-r--r--sys/dev/pci/auixp.c6
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c4
-rw-r--r--sys/dev/wscons/wsemul_dumb.c4
-rw-r--r--sys/dev/wscons/wsemul_sun.c6
-rw-r--r--sys/dev/wscons/wsemul_vt100.c4
-rw-r--r--sys/net80211/ieee80211_proto.c8
7 files changed, 18 insertions, 18 deletions
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c
index f91db409c0b..b97fba4218e 100644
--- a/sys/arch/luna88k/dev/siotty.c
+++ b/sys/arch/luna88k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siotty.c,v 1.4 2006/08/12 21:08:49 miod Exp $ */
+/* $OpenBSD: siotty.c,v 1.5 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */
/*-
@@ -323,7 +323,7 @@ siomctl(sc, control, op)
switch (op) {
case DMSET:
wr5 &= ~(WR5_BREAK|WR5_DTR|WR5_RTS);
- /* FALLTHRU */
+ /* FALLTHROUGH */
case DMBIS:
wr5 |= val;
break;
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 923f555b940..fcb5575c38f 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.6 2006/04/27 21:40:01 matthieu Exp $ */
+/* $OpenBSD: auixp.c,v 1.7 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
/*
@@ -312,11 +312,11 @@ auixp_commit_settings(void *hdl)
case 6:
value |= ATI_REG_OUT_DMA_SLOT_BIT(7) |
ATI_REG_OUT_DMA_SLOT_BIT(8);
- /* FALLTHRU */
+ /* FALLTHROUGH */
case 4:
value |= ATI_REG_OUT_DMA_SLOT_BIT(6) |
ATI_REG_OUT_DMA_SLOT_BIT(9);
- /* FALLTHRU */
+ /* FALLTHROUGH */
default:
value |= ATI_REG_OUT_DMA_SLOT_BIT(3) |
ATI_REG_OUT_DMA_SLOT_BIT(4);
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 95318121648..41c8a1589fe 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_compat_usl.c,v 1.18 2006/10/16 15:51:26 tom Exp $ */
+/* $OpenBSD: wsdisplay_compat_usl.c,v 1.19 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */
/*
@@ -429,7 +429,7 @@ wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p)
case KDENABIO:
if (suser(p, 0) || securelevel > 0)
return (EPERM);
- /* FALLTHRU */
+ /* FALLTHROUGH */
case KDDISABIO:
#if defined(COMPAT_FREEBSD)
{
diff --git a/sys/dev/wscons/wsemul_dumb.c b/sys/dev/wscons/wsemul_dumb.c
index 89554297b39..fc8d55ea557 100644
--- a/sys/dev/wscons/wsemul_dumb.c
+++ b/sys/dev/wscons/wsemul_dumb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_dumb.c,v 1.2 2002/03/14 01:27:03 millert Exp $ */
+/* $OpenBSD: wsemul_dumb.c,v 1.3 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: wsemul_dumb.c,v 1.7 2000/01/05 11:19:36 drochner Exp $ */
/*
@@ -188,7 +188,7 @@ wsemul_dumb_output(cookie, data, count, kernel)
/* wrap the column around. */
edp->ccol = 0;
- /* FALLTHRU */
+ /* FALLTHROUGH */
case ASCII_LF:
/* if the cur line isn't the last, incr and leave. */
diff --git a/sys/dev/wscons/wsemul_sun.c b/sys/dev/wscons/wsemul_sun.c
index a12f8b0a009..cfb8d9c5624 100644
--- a/sys/dev/wscons/wsemul_sun.c
+++ b/sys/dev/wscons/wsemul_sun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_sun.c,v 1.19 2007/01/07 13:28:50 miod Exp $ */
+/* $OpenBSD: wsemul_sun.c,v 1.20 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: wsemul_sun.c,v 1.11 2000/01/05 11:19:36 drochner Exp $ */
/*
@@ -373,7 +373,7 @@ wsemul_sun_control(edp, c)
case 'E': /* "Cursor Next Line (CNL)" */
edp->ccol = 0;
- /* FALLTHRU */
+ /* FALLTHROUGH */
case 'B': /* "Cursor Down (CUD)" */
edp->crow += min(NORMALIZE(ARG(0,1)), ROWS_LEFT);
break;
@@ -397,7 +397,7 @@ wsemul_sun_control(edp, c)
(*edp->emulops->eraserows)(edp->emulcookie,
edp->crow + 1, ROWS_LEFT, edp->bkgdattr);
}
- /* FALLTHRU */
+ /* FALLTHROUGH */
case 'K': /* "Erase in Line (EL)" */
(*edp->emulops->erasecols)(edp->emulcookie, edp->crow,
edp->ccol, COLS_LEFT + 1, edp->bkgdattr);
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index 67834bca41d..26a29c6bdf4 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100.c,v 1.17 2007/01/07 13:31:36 miod Exp $ */
+/* $OpenBSD: wsemul_vt100.c,v 1.18 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */
/*
@@ -506,7 +506,7 @@ wsemul_vt100_output_esc(edp, c)
break;
case 'E': /* NEL */
edp->ccol = 0;
- /* FALLTHRU */
+ /* FALLTHROUGH */
case 'D': /* IND */
wsemul_vt100_nextline(edp);
break;
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index d68c49f6e37..75c9a2679df 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.13 2006/12/25 19:24:27 reyk Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.14 2007/02/14 01:12:16 jsg Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -398,7 +398,7 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
default:
break;
}
- /* FALLTHRU */
+ /* FALLTHROUGH */
case IEEE80211_S_ASSOC:
switch (ic->ic_opmode) {
case IEEE80211_M_STA:
@@ -418,7 +418,7 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
default:
break;
}
- /* FALLTHRU */
+ /* FALLTHROUGH */
case IEEE80211_S_AUTH:
case IEEE80211_S_SCAN:
ic->ic_mgt_timer = 0;
@@ -470,7 +470,7 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
ether_sprintf(ic->ic_bss->ni_bssid));
}
ieee80211_free_allnodes(ic);
- /* FALLTHRU */
+ /* FALLTHROUGH */
case IEEE80211_S_AUTH:
case IEEE80211_S_ASSOC:
/* timeout restart scan */