Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / include / linux / phonet.h

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index e27cbf931740e92d2dc059e5a08b15abea4af876..26c8df7869180d4b94e4daf8b6c3b8988f7070ba 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -36,10 +36,9 @@
 /* Socket options for SOL_PNPIPE level */
 #define PNPIPE_ENCAP           1
 #define PNPIPE_IFINDEX         2
-#define PNPIPE_CREATE           3
+#define PNPIPE_PIPE_HANDLE     3
 #define PNPIPE_ENABLE           4
 /* unused slot */
-#define PNPIPE_DESTROY          6
 
 #define PNADDR_ANY             0
 #define PNADDR_BROADCAST       0xFC