diff --git a/[refs] b/[refs]
index 6ea3c1cc981a..a62c1174fcf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 643bd27298bdcc4e75b3e6a7ca459675eb5378c3
+refs/heads/master: d9de2622bd4fd29cab4ef7db66a9f916cb38e032
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index d92bc3eb7afc..65643def3182 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -3566,10 +3566,13 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
 			goto found_handler;
 	}
 
+#ifdef CONFIG_NET
 	if (S_ISSOCK(filp->f_path.dentry->d_inode->i_mode) &&
 	    cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
 		error = siocdevprivate_ioctl(fd, cmd, arg);
-	} else {
+	} else
+#endif
+	{
 		static int count;
 
 		if (++count <= 50)