X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Flockd%2Fsvc.c;h=f1bacf1a03912bb52939e5d0595b9c71f70ff8d6;hb=3c2023dd8ed31e2ecfbb2d5aa20e8884d4b339e2;hp=e50cfa3d965457f4f07a9e038d1f03540d39d69d;hpb=d5e5deddf67389eabc3d9b13004c108120d397e1;p=~andy%2Flinux

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index e50cfa3d965..f1bacf1a039 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/in.h>
 #include <linux/uio.h>
-#include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/mutex.h>
@@ -243,11 +242,9 @@ static int make_socks(struct svc_serv *serv)
 	if (err < 0)
 		goto out_err;
 
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	err = create_lockd_family(serv, PF_INET6);
 	if (err < 0 && err != -EAFNOSUPPORT)
 		goto out_err;
-#endif	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
 
 	warned = 0;
 	return 0;