Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184033
b: refs/heads/master
c: 87b09f1
h: refs/heads/master
i:
  184031: 7a0dece
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Feb 13, 2010
1 parent 1c614d7 commit e28a1ad
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f8ae5c537d937bab9cfeb83a30a9b670c3cfb35
refs/heads/master: 87b09f1f25cd1e01d7c50bf423c7fe33027d7511
6 changes: 0 additions & 6 deletions trunk/drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,6 @@ static void sky2_wol_init(struct sky2_port *sky2)
unsigned port = sky2->port;
enum flow_control save_mode;
u16 ctrl;
u32 reg1;

/* Bring hardware out of reset */
sky2_write16(hw, B0_CTST, CS_RST_CLR);
Expand Down Expand Up @@ -787,11 +786,6 @@ static void sky2_wol_init(struct sky2_port *sky2)
/* Disable PiG firmware */
sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF);

/* Turn on legacy PCI-Express PME mode */
reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
reg1 |= PCI_Y2_PME_LEGACY;
sky2_pci_write32(hw, PCI_DEV_REG1, reg1);

/* block receiver */
sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
}
Expand Down

0 comments on commit e28a1ad

Please sign in to comment.