Merge branch 'upstream-fixes'

[linux-2.6] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 6465b0e4c8cbe734190e01052703de66d8ed29c8..6e00811d44bc810a8e7d6cf64585a520dc60fce2 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -91,6 +91,7 @@
  *             2 of the License, or (at your option) any later version.
  */
 
+#include <linux/capability.h>
 #include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/types.h>