Merge commit 'v2.6.38-rc6' into for-2.6.39/core
[deliverable/linux.git] / arch / x86 / include / asm / types.h
CommitLineData
1965aae3
PA
1#ifndef _ASM_X86_TYPES_H
2#define _ASM_X86_TYPES_H
9d256ff5 3
06f5013a 4#define dma_addr_t dma_addr_t
edfa5cfa 5
73a2d096 6#include <asm-generic/types.h>
9d256ff5 7
9d256ff5 8#ifdef __KERNEL__
9d256ff5
TG
9#ifndef __ASSEMBLY__
10
9d256ff5
TG
11typedef u64 dma64_addr_t;
12#if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)
13/* DMA addresses come in 32-bit and 64-bit flavours. */
14typedef u64 dma_addr_t;
15#else
16typedef u32 dma_addr_t;
17#endif
18
19#endif /* __ASSEMBLY__ */
20#endif /* __KERNEL__ */
21
1965aae3 22#endif /* _ASM_X86_TYPES_H */
This page took 0.26847 seconds and 5 git commands to generate.