Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
  • Loading branch information
Michael Brown committed Nov 19, 2007
2 parents a1e243d + 9a4ed0f commit 6855c35
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions src/drivers/net/natsemi.c
Expand Up @@ -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
*/
Expand Down
2 changes: 0 additions & 2 deletions src/drivers/net/natsemi.h
Expand Up @@ -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] */
Expand Down

0 comments on commit 6855c35

Please sign in to comment.