Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...

[pandora-kernel.git] / include / linux / phonet.h

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