17 files changed, 84 insertions, 84 deletions

diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index 43242bdec0fa..5d2c380b9fd3 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -1,30 +1,30 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id$
+ *	$Id: asm.h,v 1.3 1993/10/16 19:11:29 rgrimes Exp $
  */
 
 #define S_ARG0	 4(%esp)
@@ -64,7 +64,7 @@
 #define OUTL	outl	(%dx)
 
 #else	wheeze
-#define ALIGN 
+#define ALIGN
 #define	LCL(x)	x
 
 #define LB(x,n) n
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index bb80505a6ed6..8ff7d8e34c51 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -2,34 +2,34 @@
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.41 1995/04/21 16:50:31 bde Exp $
+ *	$Id: boot.c,v 1.42 1995/04/21 22:20:34 julian Exp $
  */
 
 
 /*
-  Copyright 1988, 1989, 1990, 1991, 1992 
+  Copyright 1988, 1989, 1990, 1991, 1992
    by Intel Corporation, Santa Clara, California.
 
                 All Rights Reserved
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index 92334bf59507..11dd6d998999 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -2,29 +2,29 @@
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.8 1995/04/21 16:07:12 bde Exp $
+ *	$Id: boot.h,v 1.9 1995/04/21 16:50:32 bde Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 5e858e25006e..7a605f475752 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -2,29 +2,29 @@
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.11 1995/05/11 16:19:50 phk Exp $
+ *	$Id: disk.c,v 1.12 1995/05/21 03:27:13 phk Exp $
  */
 
 /*
@@ -87,7 +87,7 @@ devopen(void)
 	int dosdev = inode.i_dev;
 	int i, sector = 0, di;
 	u_long bend;
-	
+
 	di = get_diskinfo(dosdev);
 	spc = (spt = SPT(di)) * HEADS(di);
 	if (dosdev == 2)
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index ff6de6038f2e..394c27111504 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -2,29 +2,29 @@
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.12 1995/01/25 21:37:45 bde Exp $
+ *	$Id: io.c,v 1.13 1995/04/14 21:26:51 joerg Exp $
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 49109f23bce0..c88fb3dc6a50 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -2,29 +2,29 @@
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.7 1994/12/30 07:48:07 bde Exp $
+ *	$Id: sys.c,v 1.8 1995/04/14 21:26:53 joerg Exp $
  */
 
 #include "boot.h"
@@ -40,7 +40,7 @@ char buf[BUFSIZE], fsbuf[SBSIZE], iobuf[MAXBSIZE];
 
 #define BUFSIZE 8192
 #define MAPBUFSIZE BUFSIZE
-char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE]; 
+char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
 
 char mapbuf[MAPBUFSIZE];
 int mapblock;
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index 5374c31c937c..e9774f49a8dd 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -2,33 +2,33 @@
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.5 1995/01/25 21:37:48 bde Exp $
+ *	$Id: table.c,v 1.6 1995/04/14 21:26:53 joerg Exp $
  */
 
 /*
-  Copyright 1988, 1989, 1990, 1991, 1992 
+  Copyright 1988, 1989, 1990, 1991, 1992
    by Intel Corporation, Santa Clara, California.
 
                 All Rights Reserved
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index e97d03465888..4646bbb0c229 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1995/03/28 19:22:43 phk Exp $
 #
 
 MPROG=	fbsdboot.exe
@@ -8,7 +8,7 @@ BINMODE=	444
 NOMAN=
 STRIP=
 
-all:	${MPROG}	
+all:	${MPROG}
 
 install:	${MPROG}
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/sys/i386/boot/kzipboot/boot.c b/sys/i386/boot/kzipboot/boot.c
index 7a15e4e2067d..6dbd21975b80 100644
--- a/sys/i386/boot/kzipboot/boot.c
+++ b/sys/i386/boot/kzipboot/boot.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * FreeBSD kernel unpacker.
  * 1993 by Serge Vakulenko
  * modified for FreeBSD 2.1 by Gary Jennejohn - 12FEB95
diff --git a/sys/i386/boot/kzipboot/malloc.c b/sys/i386/boot/kzipboot/malloc.c
index b540ec1bc54b..7890097c908d 100644
--- a/sys/i386/boot/kzipboot/malloc.c
+++ b/sys/i386/boot/kzipboot/malloc.c
@@ -54,5 +54,5 @@ void
 free(cp, junk) /* junk not used */
 	void *cp;
 	int junk;
-{   
+{
 }
diff --git a/sys/i386/boot/kzipboot/misc.c b/sys/i386/boot/kzipboot/misc.c
index adf0e0d19ad3..a971aeec8b83 100644
--- a/sys/i386/boot/kzipboot/misc.c
+++ b/sys/i386/boot/kzipboot/misc.c
@@ -1,7 +1,7 @@
 /*
  * misc.c
- * 
- * This is a collection of several routines from gzip-1.0.3 
+ *
+ * This is a collection of several routines from gzip-1.0.3
  * adapted for Linux.
  *
  * Ported to 386bsd by Serge Vakulenko
@@ -95,7 +95,7 @@ void flush_window()
 }
 
 /*
- * Code to compute the CRC-32 table. Borrowed from 
+ * Code to compute the CRC-32 table. Borrowed from
  * gzip-1.0.3/makecrc.c.
  * Not copyrighted 1990 Mark Adler
  */
@@ -192,7 +192,7 @@ static void get_method()
 		error("Corrupted input");
 }
 
-void 
+void
 decompress_kernel (void *dest)
 {
 	output_data = dest;
diff --git a/sys/i386/boot/kzipboot/unzip.c b/sys/i386/boot/kzipboot/unzip.c
index 5883bc0b8a7d..93a2c8b84279 100644
--- a/sys/i386/boot/kzipboot/unzip.c
+++ b/sys/i386/boot/kzipboot/unzip.c
@@ -110,7 +110,7 @@ void unzip()
 		orig_len = LG(inbuf + LOCLEN);
 	}
 
-	if (method != DEFLATED) 
+	if (method != DEFLATED)
 		error("internal error, invalid method");
 	infl.gz_input = NextByte;
 	infl.gz_output = Flush;
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c
index b729a466f098..9ebfe5d3ae2c 100644
--- a/sys/i386/boot/netboot/3c509.c
+++ b/sys/i386/boot/netboot/3c509.c
@@ -8,7 +8,7 @@ Author: Martin Renters.
   Andres Vega Garcia's if_ep.c driver.
 
  Copyright (C) 1993-1994, David Greenman, Martin Renters.
- Copyright (C) 1993-1995, Andres Vega Garcia. 
+ Copyright (C) 1993-1995, Andres Vega Garcia.
  Copyright (C) 1995, Serge Babkin.
   This software may be used, modified, copied, distributed, and sold, in
   both source and binary form provided that the above copyright and these
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$Id: 3c509.c,v 1.1 1995/04/11 05:37:59 root Exp root $
+$Id: 3c509.c,v 1.1 1995/04/12 20:14:56 martin Exp $
 
 ***************************************************************************/
 
@@ -158,7 +158,7 @@ eth_probe()
 				eth_vendor=VENDOR_NONE;
 				goto no3c509;
 				}
-				
+
 			break;
 		case 1:
 			if(i & IS_AUI)
@@ -168,7 +168,7 @@ eth_probe()
 				eth_vendor=VENDOR_NONE;
 				goto no3c509;
 				}
-				
+
 			break;
 		case 3:
 			if(i & IS_BNC) {
@@ -180,7 +180,7 @@ eth_probe()
 				eth_vendor=VENDOR_NONE;
 				goto no3c509;
 				}
-				
+
 			break;
 		default:
 			printf("unknown connector\r\n");
@@ -240,8 +240,8 @@ eth_reset()
 	outw(BASE + EP_COMMAND, SET_INTR_MASK);
 	outw(BASE + EP_COMMAND, SET_RX_FILTER);
 
-	/* 
-	/* initialize card 
+	/*
+	/* initialize card
 	*/
 	while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS);
 
diff --git a/sys/i386/boot/netboot/3c509.h b/sys/i386/boot/netboot/3c509.h
index 049f235bbc5b..8bfa36812d82 100644
--- a/sys/i386/boot/netboot/3c509.h
+++ b/sys/i386/boot/netboot/3c509.h
@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met: 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer. 2. The name
  * of the author may not be used to endorse or promote products derived from
  * this software withough specific prior written permission
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -18,15 +18,15 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by:
- * 
+ *
  October 2, 1994
- 
- Modified by: Andres Vega Garcia 
 
- INRIA - Sophia Antipolis, France 
- e-mail: avega@sophia.inria.fr 
+ Modified by: Andres Vega Garcia
+
+ INRIA - Sophia Antipolis, France
+ e-mail: avega@sophia.inria.fr
  finger: avega@pax.inria.fr
 
  */
@@ -284,7 +284,7 @@
 #define S_COMMAND_IN_PROGRESS	(u_short) (0x1000)
 
 /*
- * FIFO Registers.  
+ * FIFO Registers.
  * RX Status. Window 1/Port 08
  *
  *     15:     Incomplete or FIFO empty.
@@ -310,7 +310,7 @@
 #define ERR_RX_DRIBBLE	   (u_short) (0x2<<11)
 
 /*
- * FIFO Registers.  
+ * FIFO Registers.
  * TX Status. Window 1/Port 0B
  *
  *   Reports the transmit status of a completed transmission. Writing this
@@ -335,7 +335,7 @@
 #define TXS_STATUS_OVERFLOW	0x4
 
 /*
- * Configuration control register. 
+ * Configuration control register.
  * Window 0/Port 04
  */
 /* Read */
@@ -346,7 +346,7 @@
 #define ENABLE_DRQ_IRQ			0x0001
 #define W0_P4_CMD_RESET_ADAPTER       0x4
 #define W0_P4_CMD_ENABLE_ADAPTER      0x1
-/* 
+/*
  * Media type and status.
  * Window 4/Port 0A
  */
@@ -360,7 +360,7 @@
 #define SET_IRQ(i)	( ((i)<<12) | 0xF00) /* set IRQ i */
 
 /*
- * Receive status register 
+ * Receive status register
  */
 
 #define RX_BYTES_MASK			(u_short) (0x07ff)
diff --git a/sys/i386/boot/netboot/bootmenu.c b/sys/i386/boot/netboot/bootmenu.c
index 32b266c83262..77a12ed5ff16 100644
--- a/sys/i386/boot/netboot/bootmenu.c
+++ b/sys/i386/boot/netboot/bootmenu.c
@@ -181,7 +181,7 @@ CMD_HOSTNAME - Set my hostname
 cmd_hostname(p)
 	char *p;
 {
-	if (*p) 
+	if (*p)
 		hostnamelen = ((sprintf(&nfsdiskless.my_hostnam,"%s",p) -
 			(char*)&nfsdiskless.my_hostnam) + 3) & ~3;
 	else	printf("Hostname is: %s\r\n",nfsdiskless.my_hostnam);
diff --git a/sys/i386/boot/netboot/main.c b/sys/i386/boot/netboot/main.c
index 5cadf8f2e818..8ee6cf487b3c 100644
--- a/sys/i386/boot/netboot/main.c
+++ b/sys/i386/boot/netboot/main.c
@@ -197,7 +197,7 @@ load()
 		nfsdiskless.swap_saddr.sin_len = sizeof(struct sockaddr_in);
 		nfsdiskless.swap_saddr.sin_family = AF_INET;
 		nfsdiskless.swap_saddr.sin_port = htons(swap_nfs_port);
-		nfsdiskless.swap_saddr.sin_addr.s_addr = 
+		nfsdiskless.swap_saddr.sin_addr.s_addr =
 			htonl(arptable[ARP_SWAPSERVER].ipaddr);
         	nfsdiskless.swap_args.timeo = 10;
         	nfsdiskless.swap_args.retrans = 100;
@@ -219,7 +219,7 @@ load()
 	nfsdiskless.root_saddr.sin_len = sizeof(struct sockaddr_in);
 	nfsdiskless.root_saddr.sin_family = AF_INET;
 	nfsdiskless.root_saddr.sin_port = htons(root_nfs_port);
-	nfsdiskless.root_saddr.sin_addr.s_addr = 
+	nfsdiskless.root_saddr.sin_addr.s_addr =
 		htonl(arptable[ARP_ROOTSERVER].ipaddr);
         nfsdiskless.root_args.timeo = 10;
         nfsdiskless.root_args.retrans = 100;
@@ -356,7 +356,7 @@ udp_transmit(destip, srcsock, destsock, len, buf)
 	} else {
 		long h_netmask = ntohl(netmask);
 				/* Check to see if we need gateway */
-		if (((destip & h_netmask) != 
+		if (((destip & h_netmask) !=
 			(arptable[ARP_CLIENT].ipaddr & h_netmask)) &&
 			arptable[ARP_GATEWAY].ipaddr)
 				destip = arptable[ARP_GATEWAY].ipaddr;
@@ -507,7 +507,7 @@ await_reply(type, ival, ptr)
 			if ((packetlen < protohdrlen) ||
 			   (((packet[12] << 8) | packet[13]) != IP)) continue;
 			ip = (struct iphdr *)&packet[ETHER_HDR_SIZE];
-			if ((ip->verhdrlen != 0x45) || 
+			if ((ip->verhdrlen != 0x45) ||
 				ipchksum(ip, sizeof(struct iphdr)) ||
 				(ip->protocol != IP_UDP)) continue;
 			udp = (struct udphdr *)&packet[ETHER_HDR_SIZE +
diff --git a/sys/i386/boot/netboot/ns8390.c b/sys/i386/boot/netboot/ns8390.c
index 10e88622b3e6..14cca176c825 100644
--- a/sys/i386/boot/netboot/ns8390.c
+++ b/sys/i386/boot/netboot/ns8390.c
@@ -134,7 +134,7 @@ eth_probe()
 			}
 		}
 		printf("\r\n");
-			
+
 	}
 #endif
 #ifdef INCLUDE_3COM
@@ -244,7 +244,7 @@ eth_probe()
         /*
          * Clear memory and verify that it worked (we use only 8K)
          */
-                bzero(eth_bmem, 0x2000); 
+                bzero(eth_bmem, 0x2000);
                 for(i = 0; i < 0x2000; ++i)
                         if (*((eth_bmem)+i)) {
                                 printf ("Failed to clear 3c503 shared mem.\r\n");