summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-29 21:58:16 +0200
committerWolfgang Denk <wd@denx.de>2010-06-29 21:58:16 +0200
commite365c43d6aa69b544a8f81d68596e89e9a3d6fa8 (patch)
tree12d945fae6090b4ba046906a7f0f5474bbc480af /arch/arm
parent178e26d75212f5aba63116585ef8f67ca6854e85 (diff)
parent77436d6696127dcaa9049db47b000da7f2b8e85e (diff)
downloadu-boot-imx-e365c43d6aa69b544a8f81d68596e89e9a3d6fa8.zip
u-boot-imx-e365c43d6aa69b544a8f81d68596e89e9a3d6fa8.tar.gz
u-boot-imx-e365c43d6aa69b544a8f81d68596e89e9a3d6fa8.tar.bz2
Merge branch 'next' of git://git.denx.de/u-boot-ti into next
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch-davinci/emac_defs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h
index b0ec8f5..35a1585 100644
--- a/arch/arm/include/asm/arch-davinci/emac_defs.h
+++ b/arch/arm/include/asm/arch-davinci/emac_defs.h
@@ -85,7 +85,7 @@
#endif
/* PHY mask - set only those phy number bits where phy is/can be connected */
-#define EMAC_MDIO_PHY_NUM 1
+#define EMAC_MDIO_PHY_NUM CONFIG_EMAC_MDIO_PHY_NUM
#define EMAC_MDIO_PHY_MASK (1 << EMAC_MDIO_PHY_NUM)
/* Ethernet Min/Max packet size */