---

yaml --- r: 123594 b: refs/heads/master c: f40b121 h: refs/heads/master v: v3
git-mirror · Nov 29, 2008 · 7e3c9c0 · 7e3c9c0
1 parent bd4c7c3
commit 7e3c9c0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcea83adc666061864b82c96e059dffe7268b512
+refs/heads/master: f40b121d983dfc53bde882aadec7f2f0bbcbd1c2
diff --git a/trunk/arch/arm/include/asm/dma.h b/trunk/arch/arm/include/asm/dma.h
@@ -21,7 +21,7 @@
 
 typedef unsigned int dmach_t;
 
-#include <mach/dma.h>
+#include <mach/isa-dma.h>
 
 /*
  * DMA modes

diff --git a/...ch/arm/mach-footbridge/include/mach/dma.h → ...rm/mach-footbridge/include/mach/isa-dma.h b/...ch/arm/mach-footbridge/include/mach/dma.h → ...rm/mach-footbridge/include/mach/isa-dma.h
@@ -1,5 +1,5 @@
 /*
- *  arch/arm/mach-footbridge/include/mach/dma.h
+ *  arch/arm/mach-footbridge/include/mach/isa-dma.h
  *
  *  Architecture DMA routines
  *

diff --git a/trunk/arch/arm/mach-h720x/include/mach/dma.h → ...rch/arm/mach-h720x/include/mach/isa-dma.h b/trunk/arch/arm/mach-h720x/include/mach/dma.h → ...rch/arm/mach-h720x/include/mach/isa-dma.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-h720x/include/mach/dma.h
+ * arch/arm/mach-h720x/include/mach/isa-dma.h
  *
  * Architecture DMA routes
  *

diff --git a/trunk/arch/arm/mach-rpc/include/mach/dma.h → .../arch/arm/mach-rpc/include/mach/isa-dma.h b/trunk/arch/arm/mach-rpc/include/mach/dma.h → .../arch/arm/mach-rpc/include/mach/isa-dma.h
@@ -1,5 +1,5 @@
 /*
- *  arch/arm/mach-rpc/include/mach/dma.h
+ *  arch/arm/mach-rpc/include/mach/isa-dma.h
  *
  *  Copyright (C) 1997 Russell King
  *

diff --git a/trunk/arch/arm/mach-shark/include/mach/dma.h → ...rch/arm/mach-shark/include/mach/isa-dma.h b/trunk/arch/arm/mach-shark/include/mach/dma.h → ...rch/arm/mach-shark/include/mach/isa-dma.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-shark/include/mach/dma.h
+ * arch/arm/mach-shark/include/mach/isa-dma.h
  *
  * by Alexander Schulz
  */