diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
| commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
| tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/dma-mapping.h | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/dma-mapping.h')
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index ad9cd6d49bfc..5d200e78bd81 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_DMA_MAPPING_H_ | 1 | #ifndef ASM_X86__DMA_MAPPING_H |
| 2 | #define _ASM_DMA_MAPPING_H_ | 2 | #define ASM_X86__DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for | 5 | * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for |
| @@ -250,4 +250,4 @@ static inline int dma_get_cache_alignment(void) | |||
| 250 | #define dma_is_consistent(d, h) (1) | 250 | #define dma_is_consistent(d, h) (1) |
| 251 | 251 | ||
| 252 | #include <asm-generic/dma-coherent.h> | 252 | #include <asm-generic/dma-coherent.h> |
| 253 | #endif | 253 | #endif /* ASM_X86__DMA_MAPPING_H */ |