Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[safe/jmp/linux-2.6] / include / linux / capability.h

diff --git a/include/linux/capability.h b/include/linux/capability.h
index 7a8d7ad..bb017ed 100644 (file)
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -56,10 +56,8 @@ typedef struct __user_cap_data_struct {
 
 struct vfs_cap_data {
        __u32 magic_etc;  /* Little endian */
-       struct {
-               __u32 permitted;    /* Little endian */
-               __u32 inheritable;  /* Little endian */
-       } data[1];
+       __u32 permitted;    /* Little endian */
+       __u32 inheritable;  /* Little endian */
 };
 
 #ifdef __KERNEL__