From b35ecd82123b546a3e4e659d9345b5d60e046771 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 11 Jun 2009 09:22:02 -0400
Subject: [PATCH] --- yaml --- r: 153865 b: refs/heads/master c:
 2780cd64346782a6116e316c559d70a7655ab6e5 h: refs/heads/master i:   153863:
 6214b308bff327500718f85a9dc4ec28b89e9de1 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/blackfin/mach-bf518/boards/ezbrd.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8f8847f803f4..2dd466f88700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e56e03b0cfeb997a4be9ad874c193824364942e0
+refs/heads/master: 2780cd64346782a6116e316c559d70a7655ab6e5
diff --git a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
index 1382f0382359..d9791106be9f 100644
--- a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -119,13 +119,19 @@ static struct platform_device bfin_mac_device = {
 };
 
 #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
-static struct dsa_platform_data ksz8893m_switch_data = {
+static struct dsa_chip_data ksz8893m_switch_chip_data = {
 	.mii_bus = &bfin_mii_bus.dev,
+	.port_names = {
+		NULL,
+		"eth%d",
+		"eth%d",
+		"cpu",
+	},
+};
+static struct dsa_platform_data ksz8893m_switch_data = {
+	.nr_chips = 1,
 	.netdev = &bfin_mac_device.dev,
-	.port_names[0]	= NULL,
-	.port_names[1]	= "eth%d",
-	.port_names[2]	= "eth%d",
-	.port_names[3]	= "cpu",
+	.chip = &ksz8893m_switch_chip_data,
 };
 
 static struct platform_device ksz8893m_switch_device = {