diff options
| author | Michael Brown | 2008-03-10 14:02:53 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-03-10 14:02:53 +0100 |
| commit | 3e781eb87f7b5bfa638f94234bb5e9d64508b0a4 (patch) | |
| tree | 5884ac0438320638c846166856a4b54b3564bd23 /src/drivers/net/e1000 | |
| parent | [PXE] Work around a buffer-size bug in WinPE (diff) | |
| parent | Use plain C in timer_rdtsc for division instead of inline asssembly. (diff) | |
| download | ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.gz ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.xz ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.zip | |
Merge branch 'xl0-timer'
Diffstat (limited to 'src/drivers/net/e1000')
| -rw-r--r-- | src/drivers/net/e1000/e1000.h | 1 | ||||
| -rw-r--r-- | src/drivers/net/e1000/e1000_osdep.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/drivers/net/e1000/e1000.h b/src/drivers/net/e1000/e1000.h index b4bc1d874..4ae414513 100644 --- a/src/drivers/net/e1000/e1000.h +++ b/src/drivers/net/e1000/e1000.h @@ -36,7 +36,6 @@ #include <stdio.h> #include <io.h> #include <errno.h> -#include <timer.h> #include <byteswap.h> #include <gpxe/pci.h> #include <gpxe/malloc.h> diff --git a/src/drivers/net/e1000/e1000_osdep.h b/src/drivers/net/e1000/e1000_osdep.h index 04e148927..7df9b5e9d 100644 --- a/src/drivers/net/e1000/e1000_osdep.h +++ b/src/drivers/net/e1000/e1000_osdep.h @@ -39,7 +39,7 @@ #include <stdio.h> #include <io.h> #include <errno.h> -#include <timer.h> +#include <unistd.h> #include <byteswap.h> #include <gpxe/pci.h> #include <gpxe/if_ether.h> |