From: Eugene Surovegin Remove the not needed anymore "jumbo" member from ocp_func_emac_data. Jumbo frame support is handled by PPC4xx EMAC driver internally now. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton --- arch/ppc/platforms/4xx/ibm440gx.c | 2 -- arch/ppc/platforms/4xx/ibm440sp.c | 1 - include/asm-ppc/ibm_ocp.h | 1 - 3 files changed, 4 deletions(-) diff -puN arch/ppc/platforms/4xx/ibm440gx.c~ppc32-remove-jumbo-member-from-ocp_func_emac_data arch/ppc/platforms/4xx/ibm440gx.c --- 25/arch/ppc/platforms/4xx/ibm440gx.c~ppc32-remove-jumbo-member-from-ocp_func_emac_data Fri Dec 2 16:20:30 2005 +++ 25-akpm/arch/ppc/platforms/4xx/ibm440gx.c Fri Dec 2 16:20:30 2005 @@ -58,7 +58,6 @@ static struct ocp_func_emac_data ibm440g .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 = { @@ -72,7 +71,6 @@ static struct ocp_func_emac_data ibm440g .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() diff -puN arch/ppc/platforms/4xx/ibm440sp.c~ppc32-remove-jumbo-member-from-ocp_func_emac_data arch/ppc/platforms/4xx/ibm440sp.c --- 25/arch/ppc/platforms/4xx/ibm440sp.c~ppc32-remove-jumbo-member-from-ocp_func_emac_data Fri Dec 2 16:20:30 2005 +++ 25-akpm/arch/ppc/platforms/4xx/ibm440sp.c Fri Dec 2 16:20:30 2005 @@ -31,7 +31,6 @@ static struct ocp_func_emac_data ibm440s .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() diff -puN include/asm-ppc/ibm_ocp.h~ppc32-remove-jumbo-member-from-ocp_func_emac_data include/asm-ppc/ibm_ocp.h --- 25/include/asm-ppc/ibm_ocp.h~ppc32-remove-jumbo-member-from-ocp_func_emac_data Fri Dec 2 16:20:30 2005 +++ 25-akpm/include/asm-ppc/ibm_ocp.h Fri Dec 2 16:20:30 2005 @@ -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 */ _