7 files changed, 13 insertions, 13 deletions

diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 9d615ed2cf11..9633c5d4718b 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.102 1999/04/28 10:52:41 dt Exp $
+ *	$Id: mcd.c,v 1.103 1999/05/06 18:44:00 peter Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -478,7 +478,7 @@ static void mcd_start(int unit)
 	struct mcd_data *cd = mcd_data + unit;
 	struct partition *p;
 	struct buf *bp;
-	register s = splbio();
+	int s = splbio();
 
 	if (cd->flags & MCDMBXBSY) {
 		splx(s);
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 117ddf27fa17..12ac372c356c 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.6 1998/12/07 21:58:22 archie Exp $
+ *	$Id: pcf.c,v 1.7 1999/05/02 21:51:17 peter Exp $
  *
  */
 #include <sys/param.h>
@@ -92,7 +92,7 @@ struct pcf_isa_softc {
 #define MAXPCF 2
 
 static struct pcf_isa_softc *pcfdata[MAXPCF];
-static npcf = 0;
+static int npcf = 0;
 
 static int	pcfprobe_isa(struct isa_device *);
 static int	pcfattach_isa(struct isa_device *);
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index cc5af14cf390..7152c6252d03 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.41 1999/01/12 01:29:45 eivind Exp $ */
+/* $Id: scd.c,v 1.42 1999/04/28 10:52:51 dt Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -397,7 +397,7 @@ scd_start(int unit)
 	struct scd_data *cd = scd_data + unit;
 	struct buf *bp;
 	struct partition *p;
-	register s = splbio();
+	int s = splbio();
 
 	if (cd->flags & SCDMBXBSY) {
 		splx(s);
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 9d615ed2cf11..9633c5d4718b 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.102 1999/04/28 10:52:41 dt Exp $
+ *	$Id: mcd.c,v 1.103 1999/05/06 18:44:00 peter Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -478,7 +478,7 @@ static void mcd_start(int unit)
 	struct mcd_data *cd = mcd_data + unit;
 	struct partition *p;
 	struct buf *bp;
-	register s = splbio();
+	int s = splbio();
 
 	if (cd->flags & MCDMBXBSY) {
 		splx(s);
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 117ddf27fa17..12ac372c356c 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.6 1998/12/07 21:58:22 archie Exp $
+ *	$Id: pcf.c,v 1.7 1999/05/02 21:51:17 peter Exp $
  *
  */
 #include <sys/param.h>
@@ -92,7 +92,7 @@ struct pcf_isa_softc {
 #define MAXPCF 2
 
 static struct pcf_isa_softc *pcfdata[MAXPCF];
-static npcf = 0;
+static int npcf = 0;
 
 static int	pcfprobe_isa(struct isa_device *);
 static int	pcfattach_isa(struct isa_device *);
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index cc5af14cf390..7152c6252d03 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.41 1999/01/12 01:29:45 eivind Exp $ */
+/* $Id: scd.c,v 1.42 1999/04/28 10:52:51 dt Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -397,7 +397,7 @@ scd_start(int unit)
 	struct scd_data *cd = scd_data + unit;
 	struct buf *bp;
 	struct partition *p;
-	register s = splbio();
+	int s = splbio();
 
 	if (cd->flags & SCDMBXBSY) {
 		splx(s);
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index a832691301bd..1a1396a8722a 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -472,7 +472,7 @@ static u_char bt254_default[NUM_BT254_REGS] = {
  * Returns	1	If transfer aborted or timeout occured.
  *
  */
-static i2c_print_err = 1;
+static int i2c_print_err = 1;
 static int
 i2c_write(meteor_reg_t * mtr, u_char slave, u_char rw, u_char reg, u_char data)
 {