summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/dma.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-03-30 08:47:19 +0200
committerIngo Molnar <mingo@kernel.org>2012-03-30 08:50:06 +0200
commit186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch)
tree9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /arch/powerpc/include/asm/dma.h
parent99dd5497e5be4fe4194cad181d45fd6569a930db (diff)
parent4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff)
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/include/asm/dma.h')
-rw-r--r--arch/powerpc/include/asm/dma.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/dma.h b/arch/powerpc/include/asm/dma.h
index adadb9943610..f6813e919bb2 100644
--- a/arch/powerpc/include/asm/dma.h
+++ b/arch/powerpc/include/asm/dma.h
@@ -24,7 +24,6 @@
#include <asm/io.h>
#include <linux/spinlock.h>
-#include <asm/system.h>
#ifndef MAX_DMA_CHANNELS
#define MAX_DMA_CHANNELS 8