aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers/net
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-15 21:15:42 +0000
committerJohn Crispin <john@openwrt.org>2015-02-15 21:15:42 +0000
commit4e5c2b6f46a2a5fd26c37e0a1c0f8d940688a6f3 (patch)
treec1459350604c5dcc338805dd74512781adb21b0b /target/linux/ar71xx/files/drivers/net
parent1e5aa680718ef3a3a7472f33af39765f325a2733 (diff)
downloadupstream-4e5c2b6f46a2a5fd26c37e0a1c0f8d940688a6f3.tar.gz
upstream-4e5c2b6f46a2a5fd26c37e0a1c0f8d940688a6f3.tar.bz2
upstream-4e5c2b6f46a2a5fd26c37e0a1c0f8d940688a6f3.zip
ar71xx: fix mv88e6063 compile for 3.14
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44459
Diffstat (limited to 'target/linux/ar71xx/files/drivers/net')
-rw-r--r--target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c b/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
index 224b4913c6..b9e9af35b8 100644
--- a/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
+++ b/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
@@ -66,11 +66,12 @@ static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
static char *mv88e6063_probe(struct mii_bus *bus, int sw_addr)
+{
#else
static char *mv88e6063_probe(struct device *host_dev, int sw_addr)
-#endif
{
struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev);
+#endif
int ret;
ret = mdiobus_read(bus, REG_PORT(0), 0x03);