diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:40:27 -0400 |
| commit | c1b054d03f5b31c33eaa0b267c629b118eaf3790 (patch) | |
| tree | 9333907ca767be24fcb3667877242976c3e3c8dd /drivers/net/e1000/e1000_hw.h | |
| parent | 559fb51ba7e66fe298b8355fabde1275b7def35f (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/e1000/e1000_hw.h')
| -rw-r--r-- | drivers/net/e1000/e1000_hw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index a0263ee96c6b..93e9f8788751 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
| @@ -66,6 +66,7 @@ typedef enum { | |||
| 66 | e1000_eeprom_spi, | 66 | e1000_eeprom_spi, |
| 67 | e1000_eeprom_microwire, | 67 | e1000_eeprom_microwire, |
| 68 | e1000_eeprom_flash, | 68 | e1000_eeprom_flash, |
| 69 | e1000_eeprom_none, /* No NVM support */ | ||
| 69 | e1000_num_eeprom_types | 70 | e1000_num_eeprom_types |
| 70 | } e1000_eeprom_type; | 71 | } e1000_eeprom_type; |
| 71 | 72 | ||