diff options
author | Eugene Surovegin <ebs@ebshome.net> | 2006-01-06 03:11:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:30 -0500 |
commit | fa57f9c2b841872ffad9d8f7b3de23d6ba33c30d (patch) | |
tree | 72ac27ad1bfc1c376d4c3af4bea5210327312faf | |
parent | 1ae8f40767a3afc6244719a2c8fbcf546767d5b0 (diff) |
[PATCH] ppc32: remove "jumbo" member from ocp_func_emac_data
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 <ebs@ebshome.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/ppc/platforms/4xx/ibm440gx.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ibm440sp.c | 1 | ||||
-rw-r--r-- | include/asm-ppc/ibm_ocp.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/ppc/platforms/4xx/ibm440gx.c b/arch/ppc/platforms/4xx/ibm440gx.c index 956f45e4ef97..d24c09ee7b18 100644 --- a/arch/ppc/platforms/4xx/ibm440gx.c +++ b/arch/ppc/platforms/4xx/ibm440gx.c | |||
@@ -58,7 +58,6 @@ static struct ocp_func_emac_data ibm440gx_emac2_def = { | |||
58 | .wol_irq = 65, /* WOL interrupt number */ | 58 | .wol_irq = 65, /* WOL interrupt number */ |
59 | .mdio_idx = -1, /* No shared MDIO */ | 59 | .mdio_idx = -1, /* No shared MDIO */ |
60 | .tah_idx = 0, /* TAH device index */ | 60 | .tah_idx = 0, /* TAH device index */ |
61 | .jumbo = 1, /* Jumbo frames supported */ | ||
62 | }; | 61 | }; |
63 | 62 | ||
64 | static struct ocp_func_emac_data ibm440gx_emac3_def = { | 63 | static struct ocp_func_emac_data ibm440gx_emac3_def = { |
@@ -72,7 +71,6 @@ static struct ocp_func_emac_data ibm440gx_emac3_def = { | |||
72 | .wol_irq = 67, /* WOL interrupt number */ | 71 | .wol_irq = 67, /* WOL interrupt number */ |
73 | .mdio_idx = -1, /* No shared MDIO */ | 72 | .mdio_idx = -1, /* No shared MDIO */ |
74 | .tah_idx = 1, /* TAH device index */ | 73 | .tah_idx = 1, /* TAH device index */ |
75 | .jumbo = 1, /* Jumbo frames supported */ | ||
76 | }; | 74 | }; |
77 | OCP_SYSFS_EMAC_DATA() | 75 | OCP_SYSFS_EMAC_DATA() |
78 | 76 | ||
diff --git a/arch/ppc/platforms/4xx/ibm440sp.c b/arch/ppc/platforms/4xx/ibm440sp.c index feb17e41ef69..71a0117d3597 100644 --- a/arch/ppc/platforms/4xx/ibm440sp.c +++ b/arch/ppc/platforms/4xx/ibm440sp.c | |||
@@ -31,7 +31,6 @@ static struct ocp_func_emac_data ibm440sp_emac0_def = { | |||
31 | .wol_irq = 61, /* WOL interrupt number */ | 31 | .wol_irq = 61, /* WOL interrupt number */ |
32 | .mdio_idx = -1, /* No shared MDIO */ | 32 | .mdio_idx = -1, /* No shared MDIO */ |
33 | .tah_idx = -1, /* No TAH */ | 33 | .tah_idx = -1, /* No TAH */ |
34 | .jumbo = 1, /* Jumbo frames supported */ | ||
35 | }; | 34 | }; |
36 | OCP_SYSFS_EMAC_DATA() | 35 | OCP_SYSFS_EMAC_DATA() |
37 | 36 | ||
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 */ |