diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-07-29 18:23:13 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-29 18:23:13 -0400 |
commit | 16b237dc44c716dbd9aeee4ab8aa9c33a62d5998 (patch) | |
tree | 8375078159747d57c7f1b3d42b5a0b48afaad4a9 /arch/arm/mach-kirkwood/rd88f6281-setup.c | |
parent | 8051367586314ab005dacead790a3b2e4e3dcc58 (diff) | |
parent | ac0a2d0c8ab18045ab217339a71e76c76e186ede (diff) |
Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes
Diffstat (limited to 'arch/arm/mach-kirkwood/rd88f6281-setup.c')
-rw-r--r-- | arch/arm/mach-kirkwood/rd88f6281-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index e1f8de2c74a..b6437f47a77 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c @@ -18,6 +18,7 @@ #include <linux/timer.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> +#include <linux/ethtool.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/pci.h> @@ -69,6 +70,8 @@ static struct platform_device rd88f6281_nand_flash = { static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { .phy_addr = -1, + .speed = SPEED_1000, + .duplex = DUPLEX_FULL, }; static struct mv_sata_platform_data rd88f6281_sata_data = { |