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/db88f6281-bp-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/db88f6281-bp-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index 610fb24d8ae2..cd317795f355 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include "common.h" | 25 | #include "common.h" |
| 26 | 26 | ||
| 27 | static struct mv643xx_eth_platform_data db88f6281_ge00_data = { | 27 | static struct mv643xx_eth_platform_data db88f6281_ge00_data = { |
| 28 | .phy_addr = 8, | 28 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | static struct mv_sata_platform_data db88f6281_sata_data = { | 31 | static struct mv_sata_platform_data db88f6281_sata_data = { |