From e511049fef9481238ad4063cf6e2e98d7d59f7e0 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 25 Feb 2011 11:23:22 -0800
Subject: [PATCH] --- yaml --- r: 237471 b: refs/heads/master c:
 004971353a403d75e7d50f8b3b304272ef056248 h: refs/heads/master i:   237469:
 00ac8a246231cce9270d15b00e1d64cb0555575f   237467:
 330a056b93574b737d46400e0678e3ecda6da92a   237463:
 9b8120d65e460b80508d784df37043db85639a37   237455:
 19b7bfc8d9c773751d681e2f4a5b2c5b2b4f572d   237439:
 68667e58b5220a82a2da36bb96038af79d25c338 v: v3

---
 [refs]                 | 2 +-
 trunk/net/phonet/pep.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a32552b428e..534556dab7b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f44fcc72a454c5eb7cbc138bd53f0963f23e87f
+refs/heads/master: 004971353a403d75e7d50f8b3b304272ef056248
diff --git a/trunk/net/phonet/pep.c b/trunk/net/phonet/pep.c
index b8c31fc928e1..875e86cadcfd 100644
--- a/trunk/net/phonet/pep.c
+++ b/trunk/net/phonet/pep.c
@@ -849,6 +849,7 @@ static int pep_do_rcv(struct sock *sk, struct sk_buff *skb)
 	return err;
 }
 
+#ifndef CONFIG_PHONET_PIPECTRLR
 static int pipe_do_remove(struct sock *sk)
 {
 	struct pep_sock *pn = pep_sk(sk);
@@ -870,6 +871,7 @@ static int pipe_do_remove(struct sock *sk)
 
 	return pn_skb_send(sk, skb, NULL);
 }
+#endif
 
 /* associated socket ceases to exist */
 static void pep_sock_close(struct sock *sk, long timeout)