Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git] / arch / cris / include / asm / types.h
1 #ifndef _ETRAX_TYPES_H
2 #define _ETRAX_TYPES_H
3
4 #include <asm-generic/int-ll64.h>
5
6 #ifndef __ASSEMBLY__
7
8 typedef unsigned short umode_t;
9
10 #endif /* __ASSEMBLY__ */
11
12 /*
13  * These aren't exported outside the kernel to avoid name space clashes
14  */
15 #ifdef __KERNEL__
16
17 #define BITS_PER_LONG 32
18
19 #endif /* __KERNEL__ */
20
21 #endif