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

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

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 703cfa33a3ca60c79111ba3808f228c8f1f7b505..bb9127dd814b4d377d915fb693c8f8659ffe0639 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1038,7 +1038,7 @@ struct ctl_table
        const char *procname;           /* Text ID for /proc/sys, or zero */
        void *data;
        int maxlen;
-       mode_t mode;
+       umode_t mode;
        struct ctl_table *child;
        struct ctl_table *parent;       /* Automatically set */
        proc_handler *proc_handler;     /* Callback for text formatting */