diff options
| author | Michael Brown | 2007-12-15 20:37:44 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-12-15 20:37:44 +0100 |
| commit | 7e8624a26fbf1d29264f73326f9ffadb8ed2876a (patch) | |
| tree | c7ecf5ff0ccdee8133ea4988ffb752235ac0498f /src/drivers/net/eepro.c | |
| parent | Autodetect whether or not we need to be using -fno-stack-protector. (diff) | |
| parent | Correct e1000 interrupt routine to enable on 1 disable on 0. duh. (diff) | |
| download | ipxe-7e8624a26fbf1d29264f73326f9ffadb8ed2876a.tar.gz ipxe-7e8624a26fbf1d29264f73326f9ffadb8ed2876a.tar.xz ipxe-7e8624a26fbf1d29264f73326f9ffadb8ed2876a.zip | |
Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
Diffstat (limited to 'src/drivers/net/eepro.c')
| -rw-r--r-- | src/drivers/net/eepro.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c index 4d5a798e..0a9c95e6 100644 --- a/src/drivers/net/eepro.c +++ b/src/drivers/net/eepro.c @@ -562,7 +562,6 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) { const char *name; nic->irqno = 0; - isa_fill_nic ( nic, isa ); nic->ioaddr = isa->ioaddr; station_addr.saddr[2] = read_eeprom(nic->ioaddr,2); @@ -627,3 +626,11 @@ DRIVER ( "eepro", nic_driver, isa_driver, eepro_driver, eepro_probe, eepro_disable ); ISA_ROM ( "eepro", "Intel Etherexpress Pro/10" ); + +/* + * Local variables: + * c-basic-offset: 8 + * c-indent-level: 8 + * tab-width: 8 + * End: + */ |