diff options
author | Michael Brown | 2005-04-12 20:21:38 +0200 |
---|---|---|
committer | Michael Brown | 2005-04-12 20:21:38 +0200 |
commit | 1218698e019f7acf431ad35e46069b859b7743d0 (patch) | |
tree | f8cb187cda2477365d09de6a25a9fe413900160a /src/include/nic.h | |
parent | Include dev.h, since several drivers just include nic.h (diff) | |
download | ipxe-1218698e019f7acf431ad35e46069b859b7743d0.tar.gz ipxe-1218698e019f7acf431ad35e46069b859b7743d0.tar.xz ipxe-1218698e019f7acf431ad35e46069b859b7743d0.zip |
Cope with nic.h being included before (or without) dev.h
Diffstat (limited to 'src/include/nic.h')
-rw-r--r-- | src/include/nic.h | 7 |
1 files 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 */ |