summaryrefslogtreecommitdiffstats
path: root/arch/score/include/asm/posix_types.h
diff options
context:
space:
mode:
authorRussell King2009-09-24 22:22:33 +0200
committerRussell King2009-09-24 22:22:33 +0200
commitbaea7b946f00a291b166ccae7fcfed6c01530cc6 (patch)
tree4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/score/include/asm/posix_types.h
parentMerge branch 'master' into for-linus (diff)
parentMerge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadkernel-qcow2-linux-baea7b946f00a291b166ccae7fcfed6c01530cc6.tar.gz
kernel-qcow2-linux-baea7b946f00a291b166ccae7fcfed6c01530cc6.tar.xz
kernel-qcow2-linux-baea7b946f00a291b166ccae7fcfed6c01530cc6.zip
Merge branch 'origin' into for-linus
Conflicts: MAINTAINERS
Diffstat (limited to 'arch/score/include/asm/posix_types.h')
-rw-r--r--arch/score/include/asm/posix_types.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/score/include/asm/posix_types.h b/arch/score/include/asm/posix_types.h
new file mode 100644
index 000000000000..b88acf80048a
--- /dev/null
+++ b/arch/score/include/asm/posix_types.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_SCORE_POSIX_TYPES_H
+#define _ASM_SCORE_POSIX_TYPES_H
+
+#include <asm-generic/posix_types.h>
+
+#endif /* _ASM_SCORE_POSIX_TYPES_H */