diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-09-25 02:40:52 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-25 02:40:52 +0200 |
| commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
| tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | |
| parent | Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgar... (diff) | |
| parent | mv643xx_eth: bump version to 1.4 (diff) | |
| download | linux-ae19161e28a7b48d2752eff3ac8eb7703986c313.tar.xz linux-ae19161e28a7b48d2752eff3ac8eb7703986c313.zip | |
Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f5181l-ge-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c index a1fe3257320d..ebde81416499 100644 --- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c @@ -89,7 +89,7 @@ static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = { }; static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = { - .phy_addr = -1, + .phy_addr = MV643XX_ETH_PHY_NONE, .speed = SPEED_1000, .duplex = DUPLEX_FULL, }; |