summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-06-17 14:01:00 +0000
committerbde <bde@FreeBSD.org>1998-06-17 14:01:00 +0000
commit6fe3c033c01dbda334ff6a169bdd218ae2d0efd0 (patch)
treed19f981f56f437f67215636b8d0fd36c21c57295 /sys
parent26666467e4bd34b1201c4a96aa4490a2b37070e0 (diff)
downloadFreeBSD-src-6fe3c033c01dbda334ff6a169bdd218ae2d0efd0.zip
FreeBSD-src-6fe3c033c01dbda334ff6a169bdd218ae2d0efd0.tar.gz
Include <i386/isa/pnp.h> after including its prerequisite
<i386/isa/isa_device.h> - don't depend on pollution in <sys/conf.h> including the prerequisite earlier.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ed/if_ed.c10
-rw-r--r--sys/i386/isa/if_ed.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index d670bf2..d5d6ad9 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ed.c,v 1.140 1998/04/17 22:36:34 des Exp $
+ * $Id: if_ed.c,v 1.141 1998/06/07 17:10:26 dfr Exp $
*/
/*
@@ -70,10 +70,6 @@
#include <net/bpf.h>
#endif
-#if NPNP > 0
-#include <i386/isa/pnp.h>
-#endif
-
#include <machine/clock.h>
#include <machine/md_var.h>
@@ -81,6 +77,10 @@
#include <i386/isa/icu.h>
#include <i386/isa/if_edreg.h>
+#if NPNP > 0
+#include <i386/isa/pnp.h>
+#endif
+
/*
* ed_softc: per line info and status
*/
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index d670bf2..d5d6ad9 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ed.c,v 1.140 1998/04/17 22:36:34 des Exp $
+ * $Id: if_ed.c,v 1.141 1998/06/07 17:10:26 dfr Exp $
*/
/*
@@ -70,10 +70,6 @@
#include <net/bpf.h>
#endif
-#if NPNP > 0
-#include <i386/isa/pnp.h>
-#endif
-
#include <machine/clock.h>
#include <machine/md_var.h>
@@ -81,6 +77,10 @@
#include <i386/isa/icu.h>
#include <i386/isa/if_edreg.h>
+#if NPNP > 0
+#include <i386/isa/pnp.h>
+#endif
+
/*
* ed_softc: per line info and status
*/
OpenPOWER on IntegriCloud