diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 08:59:34 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 08:59:34 +0300 |
| commit | 725b2805fd5d729b0db59fe8fc992e97523782c7 (patch) | |
| tree | 04ca7c7ed6e918029898a6c5301488e60d0564d4 /include/asm-powerpc/dma-mapping.h | |
| parent | 9ac341ae799413708e674bc65c8a72c90dae8d34 (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
| download | linux-725b2805fd5d729b0db59fe8fc992e97523782c7.tar.xz | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/asm-powerpc/dma-mapping.h')
| -rw-r--r-- | include/asm-powerpc/dma-mapping.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h index 837756ab7dc7..2ac63f569592 100644 --- a/include/asm-powerpc/dma-mapping.h +++ b/include/asm-powerpc/dma-mapping.h @@ -15,7 +15,6 @@ #include <linux/mm.h> #include <asm/scatterlist.h> #include <asm/io.h> -#include <asm/bug.h> #define DMA_ERROR_CODE (~(dma_addr_t)0x0) |