diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /include/asm-ppc/ibm_ocp.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'include/asm-ppc/ibm_ocp.h')
| -rw-r--r-- | include/asm-ppc/ibm_ocp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ppc/ibm_ocp.h b/include/asm-ppc/ibm_ocp.h index 9c21de1ff4ed..ddce616f765a 100644 --- a/include/asm-ppc/ibm_ocp.h +++ b/include/asm-ppc/ibm_ocp.h | |||
| @@ -63,7 +63,6 @@ struct ocp_func_emac_data { | |||
| 63 | int wol_irq; /* WOL interrupt */ | 63 | int wol_irq; /* WOL interrupt */ |
| 64 | int mdio_idx; /* EMAC idx of MDIO master or -1 */ | 64 | int mdio_idx; /* EMAC idx of MDIO master or -1 */ |
| 65 | int tah_idx; /* TAH device index or -1 */ | 65 | int tah_idx; /* TAH device index or -1 */ |
| 66 | int jumbo; /* Jumbo frames capable flag */ | ||
| 67 | int phy_mode; /* PHY type or configurable mode */ | 66 | int phy_mode; /* PHY type or configurable mode */ |
| 68 | u8 mac_addr[6]; /* EMAC mac address */ | 67 | u8 mac_addr[6]; /* EMAC mac address */ |
| 69 | u32 phy_map; /* EMAC phy map */ | 68 | u32 phy_map; /* EMAC phy map */ |