diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-09-24 20:40:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 20:40:52 -0400 |
| commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
| tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /arch/arm/mach-kirkwood/rd88f6281-setup.c | |
| parent | 152cbcf94baec68b45832db5024184906ab798b1 (diff) | |
| parent | 042af53c7839282de15cc7fd7ad8ab938d74ab7c (diff) | |
Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'arch/arm/mach-kirkwood/rd88f6281-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index d96487a0f18b..b6416615c0b9 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
| @@ -69,7 +69,7 @@ static struct platform_device rd88f6281_nand_flash = { | |||
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { | 71 | static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { |
| 72 | .phy_addr = -1, | 72 | .phy_addr = MV643XX_ETH_PHY_NONE, |
| 73 | .speed = SPEED_1000, | 73 | .speed = SPEED_1000, |
| 74 | .duplex = DUPLEX_FULL, | 74 | .duplex = DUPLEX_FULL, |
| 75 | }; | 75 | }; |