Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[linux-2.6/openmoko-kernel/knife-kernel.git] / include / asm-cris / types.h
blob5790262cbe8ae8c0da682c622e07b0da13606e7d
1 #ifndef _ETRAX_TYPES_H
2 #define _ETRAX_TYPES_H
4 #include <asm-generic/int-ll64.h>
6 #ifndef __ASSEMBLY__
8 typedef unsigned short umode_t;
10 #endif /* __ASSEMBLY__ */
13 * These aren't exported outside the kernel to avoid name space clashes
15 #ifdef __KERNEL__
17 #define BITS_PER_LONG 32
19 #ifndef __ASSEMBLY__
21 /* Dma addresses are 32-bits wide, just like our other addresses. */
23 typedef u32 dma_addr_t;
24 typedef u32 dma64_addr_t;
26 #endif /* __ASSEMBLY__ */
28 #endif /* __KERNEL__ */
30 #endif