Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

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

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 3b1594d662b02cbc123d6970f647ff501340d4c0..30e816148df42c0dd4c7fc0f71755a2a7a448215 100644 (file)
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -93,7 +93,7 @@ struct kern_ipc_perm
        gid_t           gid;
        uid_t           cuid;
        gid_t           cgid;
-       mode_t          mode; 
+       umode_t         mode; 
        unsigned long   seq;
        void            *security;
 };