diff --git a/[refs] b/[refs]
index 60cff01c0fca..f35c4e285020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a05abcb5c912ce7127e5c638b490313e88541784
+refs/heads/master: 00c60a8312c235cac1c879b620ecb71413e9245d
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index 03fd5821d9a1..b1b93ff2351f 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -89,7 +89,6 @@
 #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)
 #define PPPOE_HASH_MASK	(PPPOE_HASH_SIZE - 1)
 
-static int pppoe_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);