summaryrefslogtreecommitdiff
path: root/include/asm-powerpc/dma-mapping.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-10 08:51:29 +0300
committerPaul Mackerras <paulus@samba.org>2006-02-10 08:51:29 +0300
commitd6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch)
treeeeec5011a42f38d3dfe7b61788b7ac1cc890edeb /include/asm-powerpc/dma-mapping.h
parent8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff)
parentad71f123a9e9b809f6c829db1222ce0423a1153c (diff)
downloadlinux-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.xz
Merge ../powerpc-merge
Diffstat (limited to 'include/asm-powerpc/dma-mapping.h')
-rw-r--r--include/asm-powerpc/dma-mapping.h1
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)