From 1cf5f7700254463d3161924b314c7ffe96235fb5 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 16 Dec 2005 22:35:23 +0000
Subject: [PATCH] --- yaml --- r: 15201 b: refs/heads/master c:
 7c3dbbe982ac85837f1da150ea9539a9e9a12557 h: refs/heads/master i:   15199:
 2c9b32fe0c9fdc305376dfdb43155057cbf7007b v: v3

---
 [refs]                             | 2 +-
 trunk/arch/ppc/syslib/ppc4xx_dma.c | 1 +
 trunk/include/asm-ppc/ppc4xx_dma.h | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 70f89574077e..bce9877a81e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a78719c387cc25ed97304a235a20c24f0f89399b
+refs/heads/master: 7c3dbbe982ac85837f1da150ea9539a9e9a12557
diff --git a/trunk/arch/ppc/syslib/ppc4xx_dma.c b/trunk/arch/ppc/syslib/ppc4xx_dma.c
index f15e64285f96..05ccd598dd4e 100644
--- a/trunk/arch/ppc/syslib/ppc4xx_dma.c
+++ b/trunk/arch/ppc/syslib/ppc4xx_dma.c
@@ -30,6 +30,7 @@
 
 #include <asm/system.h>
 #include <asm/io.h>
+#include <asm/dma.h>
 #include <asm/ppc4xx_dma.h>
 
 ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
diff --git a/trunk/include/asm-ppc/ppc4xx_dma.h b/trunk/include/asm-ppc/ppc4xx_dma.h
index a415001165fa..46a086fff816 100644
--- a/trunk/include/asm-ppc/ppc4xx_dma.h
+++ b/trunk/include/asm-ppc/ppc4xx_dma.h
@@ -33,9 +33,6 @@
 
 #define MAX_PPC4xx_DMA_CHANNELS		4
 
-/* in arch/ppc/kernel/setup.c -- Cort */
-extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ;
-
 /*
  * Function return status codes
  * These values are used to indicate whether or not the function