diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/dma-mapping.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/dma-mapping.h')
| -rw-r--r-- | include/asm-powerpc/dma-mapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h index a96e5742ca32..837756ab7dc7 100644 --- a/include/asm-powerpc/dma-mapping.h +++ b/include/asm-powerpc/dma-mapping.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | */ | 6 | */ |
| 7 | #ifndef _ASM_DMA_MAPPING_H | 7 | #ifndef _ASM_DMA_MAPPING_H |
| 8 | #define _ASM_DMA_MAPPING_H | 8 | #define _ASM_DMA_MAPPING_H |
| 9 | #ifdef __KERNEL__ | ||
| 9 | 10 | ||
| 10 | #include <linux/config.h> | 11 | #include <linux/config.h> |
| 11 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| @@ -282,4 +283,5 @@ struct dma_mapping_ops { | |||
| 282 | int (*dac_dma_supported)(struct device *dev, u64 mask); | 283 | int (*dac_dma_supported)(struct device *dev, u64 mask); |
| 283 | }; | 284 | }; |
| 284 | 285 | ||
| 286 | #endif /* __KERNEL__ */ | ||
| 285 | #endif /* _ASM_DMA_MAPPING_H */ | 287 | #endif /* _ASM_DMA_MAPPING_H */ |