diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /arch/arm/mach-orion5x/dns323-setup.c | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'arch/arm/mach-orion5x/dns323-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index b38c65ccfb15..3e66098340a5 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
| @@ -79,7 +79,7 @@ subsys_initcall(dns323_pci_init); | |||
| 79 | */ | 79 | */ |
| 80 | 80 | ||
| 81 | static struct mv643xx_eth_platform_data dns323_eth_data = { | 81 | static struct mv643xx_eth_platform_data dns323_eth_data = { |
| 82 | .phy_addr = 8, | 82 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), |
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | /**************************************************************************** | 85 | /**************************************************************************** |