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)