diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2006-12-04 02:27:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 11:28:47 -0500 |
| commit | 04a9f081b76f536bcf69db066153c2a4231d5783 (patch) | |
| tree | 5e2cb177794bd89863b94147f1817df4d6e0dc02 | |
| parent | d773c660973560970a6b3697cb280ddc5389447d (diff) | |
[PATCH] m68knommu: fix dma-mapping.h
Make the m68knommu DMA handling consistent with other architectures.
Compile problems pointed out by Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/asm-m68knommu/dma-mapping.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-m68knommu/dma-mapping.h b/include/asm-m68knommu/dma-mapping.h index 5622b855a577..6aeab18e58bd 100644 --- a/include/asm-m68knommu/dma-mapping.h +++ b/include/asm-m68knommu/dma-mapping.h | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | #ifndef _M68KNOMMU_DMA_MAPPING_H | 1 | #ifndef _M68KNOMMU_DMA_MAPPING_H |
| 2 | #define _M68KNOMMU_DMA_MAPPING_H | 2 | #define _M68KNOMMU_DMA_MAPPING_H |
| 3 | 3 | ||
| 4 | |||
| 5 | #ifdef CONFIG_PCI | 4 | #ifdef CONFIG_PCI |
| 6 | #include <asm-generic/dma-mapping.h> | 5 | #include <asm-generic/dma-mapping.h> |
| 6 | #else | ||
| 7 | #include <asm-generic/dma-mapping-broken.h> | ||
| 7 | #endif | 8 | #endif |
| 8 | 9 | ||
| 9 | #endif /* _M68KNOMMU_DMA_MAPPING_H */ | 10 | #endif /* _M68KNOMMU_DMA_MAPPING_H */ |