projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
566806c
)
ppc4xx: Fix small merge problem in 4xx_enet.c
author
Stefan Roese
<sr@denx.de>
Fri, 5 Oct 2007 15:35:10 +0000
(17:35 +0200)
committer
Stefan Roese
<sr@denx.de>
Wed, 31 Oct 2007 20:20:49 +0000
(21:20 +0100)
Signed-off-by: Stefan Roese <sr@denx.de>
cpu/ppc4xx/4xx_enet.c
patch
|
blob
|
history
diff --git
a/cpu/ppc4xx/4xx_enet.c
b/cpu/ppc4xx/4xx_enet.c
index 841cb77d6de0e48373954834cfb43fcb0757b113..6b4834481e352eb71cfe9297135c0e2992577920 100644
(file)
--- a/
cpu/ppc4xx/4xx_enet.c
+++ b/
cpu/ppc4xx/4xx_enet.c
@@
-139,7
+139,7
@@
#define BI_PHYMODE_MII 7
#endif
-#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) \
+#if defined(CONFIG_440SP) || defined(CONFIG_440SPE)
||
\
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_405EX)
#define SDR0_MFR_ETH_CLK_SEL_V(n) ((0x01<<27) / (n+1))