summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorMichael Brown2007-11-21 16:35:08 +0100
committerMichael Brown2007-11-21 16:35:08 +0100
commitb53ee1eb1673ee94c61600cabb2b066f1c977a01 (patch)
treed441f0f40cbef937cd23873ee535ddb7bce09393 /src/include
parentRemove some assumptions about DHCP obtaining only a single options block. (diff)
parentFixed receive instability by not enabling interrupts. duh. (diff)
downloadipxe-b53ee1eb1673ee94c61600cabb2b066f1c977a01.tar.gz
ipxe-b53ee1eb1673ee94c61600cabb2b066f1c977a01.tar.xz
ipxe-b53ee1eb1673ee94c61600cabb2b066f1c977a01.zip
Merge commit 'origin/mdc-working'
Diffstat (limited to 'src/include')
-rw-r--r--src/include/gpxe/errfile.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/gpxe/errfile.h b/src/include/gpxe/errfile.h
index 1b0ed33f..94648e26 100644
--- a/src/include/gpxe/errfile.h
+++ b/src/include/gpxe/errfile.h
@@ -85,7 +85,6 @@
#define ERRFILE_davicom ( ERRFILE_DRIVER | 0x00340000 )
#define ERRFILE_depca ( ERRFILE_DRIVER | 0x00350000 )
#define ERRFILE_dmfe ( ERRFILE_DRIVER | 0x00360000 )
-#define ERRFILE_e1000 ( ERRFILE_DRIVER | 0x00370000 )
#define ERRFILE_eepro100 ( ERRFILE_DRIVER | 0x00380000 )
#define ERRFILE_epic100 ( ERRFILE_DRIVER | 0x00390000 )
#define ERRFILE_forcedeth ( ERRFILE_DRIVER | 0x003a0000 )
@@ -102,6 +101,8 @@
#define ERRFILE_via_velocity ( ERRFILE_DRIVER | 0x00450000 )
#define ERRFILE_w89c840 ( ERRFILE_DRIVER | 0x00460000 )
#define ERRFILE_ipoib ( ERRFILE_DRIVER | 0x00470000 )
+#define ERRFILE_e1000 ( ERRFILE_DRIVER | 0x00480000 )
+#define ERRFILE_e1000_hw ( ERRFILE_DRIVER | 0x00490000 )
#define ERRFILE_scsi ( ERRFILE_DRIVER | 0x00700000 )
#define ERRFILE_arbel ( ERRFILE_DRIVER | 0x00710000 )