summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-10-14 17:10:55 +0200
committerArnd Bergmann <arnd@arndb.de>2015-10-14 17:10:55 +0200
commitd51664ab9e06225a039487990a3b051fed795137 (patch)
tree30fc6fd6b3f58c6a27c3ac351a9287d839e59c5a
parent25cb62b76430a91cc6195f902e61c2cb84ade622 (diff)
parentd836ace65ee98d7079bc3c5afdbcc0e27dca20a3 (diff)
downloadlinux-d51664ab9e06225a039487990a3b051fed795137.tar.bz2
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.c2
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)
d->netdev = &orion_ge00.dev;
for (i = 0; i < d->nr_chips; i++)
- d->chip[i].host_dev = &orion_ge00_shared.dev;
+ d->chip[i].host_dev = &orion_ge_mvmdio.dev;
orion_switch_device.dev.platform_data = d;
platform_device_register(&orion_switch_device);