From 61cc0e30d982ad49a9830d4cc75becf4e046d578 Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Tue, 8 Jun 2010 19:07:56 +0000
Subject: [PATCH] --- yaml --- r: 202701 b: refs/heads/master c:
 97859160c5158a97a4b976a2d7bc74cf2223afe0 h: refs/heads/master i:   202699:
 1d29053149488dc82f56e490dec3d9c2ae6faa4a v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/pppoe.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f24fecf4da6a..35c8abd02344 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfa087f689402438e3cb0f077e649d01c871b0e7
+refs/heads/master: 97859160c5158a97a4b976a2d7bc74cf2223afe0
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index 7ebb8e87efa4..344ef330e123 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_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 
 static const struct proto_ops pppoe_ops;