diff options
| author | Michael Brown <mcb30@etherboot.org> | 2007-11-19 20:14:49 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2007-11-19 20:14:49 +0000 |
| commit | 6855c357a552cb05037303a942458ceed3293830 (patch) | |
| tree | fcf1f943d71ae869b4710688cb42027db861c6a5 | |
| parent | a1e243d504a9348ed0afbb53aa345ba1eed99965 (diff) | |
| parent | 9a4ed0f2d5e6ee2b59888758a86ba0a0973e84fd (diff) | |
| download | ipxe-6855c357a552cb05037303a942458ceed3293830.tar.gz | |
Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
| -rw-r--r-- | src/drivers/net/natsemi.c | 3 | ||||
| -rw-r--r-- | src/drivers/net/natsemi.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c index 4928f1b8..dcecbb1f 100644 --- a/src/drivers/net/natsemi.c +++ b/src/drivers/net/natsemi.c @@ -332,8 +332,7 @@ static int natsemi_open (struct net_device *netdev) * With PME set the chip will scan incoming packets but * nothing will be written to memory. */ - SavedClkRun = inl (np->ioaddr + ClkRun); - outl (SavedClkRun & ~0x100, np->ioaddr + ClkRun); + outl (inl (np->ioaddr + ClkRun) & ~0x100, np->ioaddr + ClkRun); /* Set MAC address in NIC */ diff --git a/src/drivers/net/natsemi.h b/src/drivers/net/natsemi.h index d13d7015..13b5545a 100644 --- a/src/drivers/net/natsemi.h +++ b/src/drivers/net/natsemi.h @@ -182,8 +182,6 @@ enum MIntrCtrl_bits { MICRIntEn = 0x2, }; -static uint32_t SavedClkRun; - /* CFG bits [13:16] [18:23] */ #define CFG_RESET_SAVE 0xfde000 /* WCSR bits [0:4] [9:10] */ |