diff --git a/[refs] b/[refs] index 9c2cee6bcb01..92411243d8ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bc0986957b63a2fbbc46ab95d3d1d72830bda83 +refs/heads/master: 8cd25c1fcfbf6460983e99091d278187421c1a1d diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index d57aece9492c..312cb25cbd18 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -1377,9 +1377,7 @@ extern struct ctl_table core_table[]; extern int sysctl_optmem_max; #endif -#ifdef CONFIG_PROC_FS extern __u32 sysctl_wmem_default; extern __u32 sysctl_rmem_default; -#endif #endif /* _SOCK_H */