From b4cb820142fb317707c79c0f90a8f97649ee70ab Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Thu, 15 Dec 2011 02:46:50 +0000
Subject: [PATCH] --- yaml --- r: 278815 b: refs/heads/master c:
 5d531aaa64a06622874f06e5068b8eefca048feb h: refs/heads/master i:   278813:
 0e140d72a9f34479c085001f3812efc370745209   278811:
 cc0a98ee10fa5bc5c86cd111df4a36ef8f734ceb   278807:
 feb76bb6fcfe1083e20e8403ece7ec221260f4b5   278799:
 1eef5d319adef60df101d996e2a81d57549dfa67   278783:
 3d427f85c401b0b823acfe8da78fc0bc66513b3f v: v3

---
 [refs]                  | 2 +-
 trunk/net/unix/Kconfig  | 7 +++++++
 trunk/net/unix/Makefile | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a008c64651d3..bf1a95024d1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf391958afb9b82c72324a15891eb3102200085
+refs/heads/master: 5d531aaa64a06622874f06e5068b8eefca048feb
diff --git a/trunk/net/unix/Kconfig b/trunk/net/unix/Kconfig
index 5a69733bcdad..c2128b10e5f9 100644
--- a/trunk/net/unix/Kconfig
+++ b/trunk/net/unix/Kconfig
@@ -19,3 +19,10 @@ config UNIX
 
 	  Say Y unless you know what you are doing.
 
+config UNIX_DIAG
+	tristate "UNIX: socket monitoring interface"
+	depends on UNIX
+	default UNIX
+	---help---
+	  Support for UNIX socket monitoring interface used by the ss tool.
+	  If unsure, say Y.
diff --git a/trunk/net/unix/Makefile b/trunk/net/unix/Makefile
index b852a2bde9a8..b663c607b1c6 100644
--- a/trunk/net/unix/Makefile
+++ b/trunk/net/unix/Makefile
@@ -6,3 +6,6 @@ obj-$(CONFIG_UNIX)	+= unix.o
 
 unix-y			:= af_unix.o garbage.o
 unix-$(CONFIG_SYSCTL)	+= sysctl_net_unix.o
+
+obj-$(CONFIG_UNIX_DIAG)	+= unix_diag.o
+unix_diag-y		:= diag.o