From: Rami Rosen <ramirose@gmail.com>
Date: Wed, 6 Feb 2008 00:30:50 +0000 (-0800)
Subject: [PPPOL2TP]: Label unused warning when CONFIG_PROC_FS is not set.
X-Git-Tag: v2.6.25-rc1~518^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=731a0609df9cef35ae861d31004f50a02ebde6c2;p=linux-2.6-omap-h63xx.git

[PPPOL2TP]: Label unused warning when CONFIG_PROC_FS is not set.

When CONFIG_PROC_FS is not set and CONFIG_PPPOL2TP is set,
we have the following warning in build:
  drivers/net/pppol2tp.c: In function 'pppol2tp_init':
  drivers/net/pppol2tp.c:2472: warning: label
'out_unregister_pppox_proto' defined but not used

This patches fixes this warning by adding appropriate #ifdef.

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Acked-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 1b51bb668d3..5aa0a808969 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2468,9 +2468,10 @@ static int __init pppol2tp_init(void)
 
 out:
 	return err;
-
+#ifdef CONFIG_PROC_FS
 out_unregister_pppox_proto:
 	unregister_pppox_proto(PX_PROTO_OL2TP);
+#endif
 out_unregister_pppol2tp_proto:
 	proto_unregister(&pppol2tp_sk_proto);
 	goto out;