summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Centazzo <centazzo@gmail.com>2009-07-11 11:56:06 -0700
committerBen Warren <biggerbadderben@gmail.com>2009-07-22 22:53:45 -0700
commit0544c63681d2ea3607faf374e9c56f101e365b42 (patch)
treecde444dd83ac90232f33dd2f4348814cf152f2b1
parent09133f8580f0106429ba3600f1855bd3577ae58b (diff)
downloadu-boot-imx-0544c63681d2ea3607faf374e9c56f101e365b42.zip
u-boot-imx-0544c63681d2ea3607faf374e9c56f101e365b42.tar.gz
u-boot-imx-0544c63681d2ea3607faf374e9c56f101e365b42.tar.bz2
ppc4xx: Fixed compilation warning in 4xx_enet.c
This patch fixes a compilation warning for some Ethernet PHY-less PPC4xx platforms (440SPE based ones) and a potential compilation error for 440SP platforms (use of undefined 'ethgroup' variable). In the original code and in case of 440SPE platforms, 'ethgroup' is initialized to -1 and never modified. Later in the function, within an #ifdef statement, an 'if statement' executes code only if 'ethgroup' is set to 4, therefore it is harmless to avoid executing the 'if statement' by removing the CONFIG_440SPE from the affected #ifdefs. In case of 440SP platforms with on-board Ethernet PHY, 'ethgroup' is undefined but used (there are not such platforms in the repository yet). All other architectures are not affected by this change. Signed-off-by: Alessio Centazzo acpatin@yahoo.com Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--drivers/net/4xx_enet.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index 587605d..c020048 100644
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -870,7 +870,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
defined(CONFIG_405EX)
u32 opbfreq;
sys_info_t sysinfo;
-#if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \
+#if defined(CONFIG_440GX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)
@@ -1119,7 +1119,6 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
#if defined(CONFIG_440GX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
- defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)