diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-09-25 00:40:52 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-25 00:40:52 (GMT) |
| commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
| tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /arch/arm/mach-orion5x/tsx09-common.c | |
| parent | 152cbcf94baec68b45832db5024184906ab798b1 (diff) | |
| parent | 042af53c7839282de15cc7fd7ad8ab938d74ab7c (diff) | |
| download | linux-fsl-qoriq-ae19161e28a7b48d2752eff3ac8eb7703986c313.tar.xz | |
Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'arch/arm/mach-orion5x/tsx09-common.c')
| -rw-r--r-- | arch/arm/mach-orion5x/tsx09-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c index 83feac3..19cde24 100644 --- a/arch/arm/mach-orion5x/tsx09-common.c +++ b/arch/arm/mach-orion5x/tsx09-common.c @@ -48,7 +48,7 @@ void qnap_tsx09_power_off(void) ****************************************************************************/ struct mv643xx_eth_platform_data qnap_tsx09_eth_data = { - .phy_addr = 8, + .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; static int __init qnap_tsx09_parse_hex_nibble(char n) |