From 329df59bbb127ae7a0fd8e2630cf9f5f4e2d1711 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Fri, 30 Jan 2009 20:39:30 +0530
Subject: [PATCH] --- yaml --- r: 130634 b: refs/heads/master c:
 9fa91d99bfdd9582e43b6b9ab97678c51373c4ae h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/capability.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c909e642108c..8ec69a7821fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4502b80e44f1fc9af33f66053c6c99ae9dba32a6
+refs/heads/master: 9fa91d99bfdd9582e43b6b9ab97678c51373c4ae
diff --git a/trunk/include/linux/capability.h b/trunk/include/linux/capability.h
index 02bdb768d43b..1b9872556131 100644
--- a/trunk/include/linux/capability.h
+++ b/trunk/include/linux/capability.h
@@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct {
 #define VFS_CAP_U32             VFS_CAP_U32_2
 #define VFS_CAP_REVISION	VFS_CAP_REVISION_2
 
-#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
-extern int file_caps_enabled;
-#endif
-
 struct vfs_cap_data {
 	__le32 magic_etc;            /* Little endian */
 	struct {
@@ -96,6 +92,10 @@ struct vfs_cap_data {
 #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
 #define _KERNEL_CAPABILITY_U32S    _LINUX_CAPABILITY_U32S_3
 
+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+extern int file_caps_enabled;
+#endif
+
 typedef struct kernel_cap_struct {
 	__u32 cap[_KERNEL_CAPABILITY_U32S];
 } kernel_cap_t;