diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-24 10:56:29 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-24 10:56:29 -0700 |
| commit | da27f61833f6796f83eedba90b74c177d16b6f17 (patch) | |
| tree | a14302d9c9c4e4cec475cadb64206dec8bfc0b16 | |
| parent | fffb1d2b9e7ded3277113d61aefa57a6430bc4ac (diff) | |
| parent | 65c3187a0d2076486a129541bebb1f5fd6d51149 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
| -rw-r--r-- | net/core/sysctl_net_core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index e731c96eac4b..8725b91120f8 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -23,7 +23,6 @@ #include <net/pkt_sched.h> static int zero = 0; -static int one = 1; static int ushort_max = USHRT_MAX; static int min_sndbuf = SOCK_MIN_SNDBUF; static int min_rcvbuf = SOCK_MIN_RCVBUF; |