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

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

diff --git a/include/linux/types.h b/include/linux/types.h
index cbcef6ebeba9ed671cc36c60357132556393aa1a..e5fa50345516837d035650183aebefc7f0633d8b 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -24,6 +24,7 @@ typedef __kernel_fd_set               fd_set;
 typedef __kernel_dev_t         dev_t;
 typedef __kernel_ino_t         ino_t;
 typedef __kernel_mode_t                mode_t;
+typedef unsigned short         umode_t;
 typedef __kernel_nlink_t       nlink_t;
 typedef __kernel_off_t         off_t;
 typedef __kernel_pid_t         pid_t;