diff --git a/[refs] b/[refs]
index ed7275c5670e..8d134429b484 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e1751f8396544df3b334afd2e67557757d47fb0
+refs/heads/master: 308a90683da9a3e3da1023a88496f76f95c5dcd8
diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c
index 75655add3f34..7f94ca930988 100644
--- a/trunk/drivers/net/tc35815.c
+++ b/trunk/drivers/net/tc35815.c
@@ -626,7 +626,7 @@ static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev)
 	return -ENODEV;
 }
 #else
-static int __devinit tc35815_read_plat_dev_addr(struct device *dev)
+static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev)
 {
 	return -ENODEV;
 }