From 1218698e019f7acf431ad35e46069b859b7743d0 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Tue, 12 Apr 2005 18:21:38 +0000
Subject: [PATCH] Cope with nic.h being included before (or without) dev.h

---
 src/include/nic.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/include/nic.h b/src/include/nic.h
index b3f26734..4a53a8d6 100644
--- a/src/include/nic.h
+++ b/src/include/nic.h
@@ -8,10 +8,6 @@
 #ifndef	NIC_H
 #define NIC_H
 
-/* to get global "dev" */
-struct dev;
-#include "main.h"
-
 typedef enum {
 	DISABLE = 0,
 	ENABLE,
@@ -46,6 +42,7 @@ struct nic_operations {
  * Function prototypes
  *
  */
+struct dev;
 extern struct nic * nic_device ( struct dev * dev );
 
 /*
@@ -81,5 +78,7 @@ static inline void eth_disable ( void ) {
 
 /* dev.h needs declarations from nic.h */
 #include "dev.h"
+/* to get global "dev" */
+#include "main.h"
 
 #endif	/* NIC_H */