Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16344
b: refs/heads/master
c: fa57f9c
h: refs/heads/master
v: v3
  • Loading branch information
Eugene Surovegin authored and Linus Torvalds committed Jan 6, 2006
1 parent a3314a5 commit d5df2b0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 5 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: 1ae8f40767a3afc6244719a2c8fbcf546767d5b0
refs/heads/master: fa57f9c2b841872ffad9d8f7b3de23d6ba33c30d
2 changes: 0 additions & 2 deletions trunk/arch/ppc/platforms/4xx/ibm440gx.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ static struct ocp_func_emac_data ibm440gx_emac2_def = {
.wol_irq = 65, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */
.tah_idx = 0, /* TAH device index */
.jumbo = 1, /* Jumbo frames supported */
};

static struct ocp_func_emac_data ibm440gx_emac3_def = {
Expand All @@ -72,7 +71,6 @@ static struct ocp_func_emac_data ibm440gx_emac3_def = {
.wol_irq = 67, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */
.tah_idx = 1, /* TAH device index */
.jumbo = 1, /* Jumbo frames supported */
};
OCP_SYSFS_EMAC_DATA()

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/ppc/platforms/4xx/ibm440sp.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ static struct ocp_func_emac_data ibm440sp_emac0_def = {
.wol_irq = 61, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */
.tah_idx = -1, /* No TAH */
.jumbo = 1, /* Jumbo frames supported */
};
OCP_SYSFS_EMAC_DATA()

Expand Down
1 change: 0 additions & 1 deletion trunk/include/asm-ppc/ibm_ocp.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ struct ocp_func_emac_data {
int wol_irq; /* WOL interrupt */
int mdio_idx; /* EMAC idx of MDIO master or -1 */
int tah_idx; /* TAH device index or -1 */
int jumbo; /* Jumbo frames capable flag */
int phy_mode; /* PHY type or configurable mode */
u8 mac_addr[6]; /* EMAC mac address */
u32 phy_map; /* EMAC phy map */
Expand Down

0 comments on commit d5df2b0

Please sign in to comment.