diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 11:10:55 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 11:10:55 -0400 |
| commit | d51664ab9e06225a039487990a3b051fed795137 (patch) | |
| tree | 30fc6fd6b3f58c6a27c3ac351a9287d839e59c5a | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
| parent | d836ace65ee98d7079bc3c5afdbcc0e27dca20a3 (diff) | |
Merge tag 'mvebu-fixes-4.3-1' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu fixes for 4.3 (part 1)" from Gregory CLEMENT:
DSA fixes for orion platform
* tag 'mvebu-fixes-4.3-1' of git://git.infradead.org/linux-mvebu:
ARM: orion: Fix DSA platform device after mvmdio conversion
| -rw-r--r-- | arch/arm/plat-orion/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 2235081a04ee..8861c367d061 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c | |||
| @@ -495,7 +495,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq) | |||
| 495 | 495 | ||
| 496 | d->netdev = &orion_ge00.dev; | 496 | d->netdev = &orion_ge00.dev; |
| 497 | for (i = 0; i < d->nr_chips; i++) | 497 | for (i = 0; i < d->nr_chips; i++) |
| 498 | d->chip[i].host_dev = &orion_ge00_shared.dev; | 498 | d->chip[i].host_dev = &orion_ge_mvmdio.dev; |
| 499 | orion_switch_device.dev.platform_data = d; | 499 | orion_switch_device.dev.platform_data = d; |
| 500 | 500 | ||
| 501 | platform_device_register(&orion_switch_device); | 501 | platform_device_register(&orion_switch_device); |