Some header cleanup. Remove some unused headers and shuffle some around

for consistency between drivers.

"looks good" reyk@

6 files changed, 18 insertions, 37 deletions

diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index c95d9e8fa8f..0fef718a857 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brgphy.c,v 1.77 2008/04/26 21:26:42 brad Exp $	*/
+/*	$OpenBSD: brgphy.c,v 1.78 2008/06/10 21:15:14 brad Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -44,7 +44,6 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
-#include <sys/timeout.h>
 #include <sys/errno.h>
 
 #include <machine/bus.h>
@@ -52,10 +51,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/pci/pcivar.h>
 
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 26d38617d41..8954f797136 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciphy.c,v 1.19 2008/05/29 06:20:02 brad Exp $	*/
+/*	$OpenBSD: ciphy.c,v 1.20 2008/06/10 21:15:14 brad Exp $	*/
 /*	$FreeBSD: ciphy.c,v 1.1 2004/09/10 20:57:45 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -43,24 +43,17 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 
+#include <machine/bus.h>
+
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
-#include <dev/pci/pcivar.h>
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
 
 #include <dev/mii/ciphyreg.h>
 
-#include <machine/bus.h>
-
 int	ciphymatch(struct device *, void *, void *);
 void	ciphyattach(struct device *, struct device *, void *);
 
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index a52b001692c..a6b5e638fd7 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcphy.c,v 1.18 2006/12/27 19:11:08 kettenis Exp $	*/
+/*	$OpenBSD: dcphy.c,v 1.19 2008/06/10 21:15:14 brad Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -44,17 +44,17 @@
  */
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/device.h>
 #include <sys/socket.h>
-#include <sys/timeout.h>
 #include <sys/errno.h>
 
+#include <machine/bus.h>
+
 #include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
 #include <net/if_media.h>
+
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
@@ -62,10 +62,6 @@
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
 
-#include <machine/bus.h>
-
-#include <dev/pci/pcivar.h>
-
 #include <dev/ic/dcreg.h>
 
 #define DC_SETBIT(sc, reg, x)                           \
diff --git a/sys/dev/mii/ipgphy.c b/sys/dev/mii/ipgphy.c
index 811a33211c3..16788d8193c 100644
--- a/sys/dev/mii/ipgphy.c
+++ b/sys/dev/mii/ipgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipgphy.c,v 1.8 2008/06/07 19:39:25 brad Exp $	*/
+/*	$OpenBSD: ipgphy.c,v 1.9 2008/06/10 21:15:14 brad Exp $	*/
 
 /*-
  * Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -44,10 +44,8 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 72d5b4ec9b7..9b71c3941be 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rgephy.c,v 1.27 2008/05/24 01:08:21 brad Exp $	*/
+/*	$OpenBSD: rgephy.c,v 1.28 2008/06/10 21:15:14 brad Exp $	*/
 /*
  * Copyright (c) 2003
  *	Bill Paul <wpaul@windriver.com>.  All rights reserved.
@@ -42,18 +42,15 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
-#include <sys/timeout.h>
 #include <sys/errno.h>
 
+#include <machine/bus.h>
+
 #include <net/if.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
-
-#include <dev/pci/pcivar.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
@@ -61,8 +58,6 @@
 
 #include <dev/mii/rgephyreg.h>
 
-#include <machine/bus.h>
-
 #include <dev/ic/rtl81x9reg.h>
 
 int	rgephymatch(struct device *, void *, void *);
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index afa01ba6758..e44bb707cda 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlphy.c,v 1.27 2007/01/27 20:55:14 miod Exp $	*/
+/*	$OpenBSD: rlphy.c,v 1.28 2008/06/10 21:15:14 brad Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net)
@@ -37,18 +37,20 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
-#include <sys/timeout.h>
 #include <sys/errno.h>
 
+#include <machine/bus.h>
+
 #include <net/if.h>
 #include <net/if_media.h>
+
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
-#include <machine/bus.h>
+
 #include <dev/ic/rtl81x9reg.h>
 
 int	rlphymatch(struct device *, void *, void *);