[ARM] Rename ISA mach/dma.h header to mach/isa-dma.h

This avoids confusion with platform specific DMA implementations in mach/dma.h Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
git-mirror · Nov 29, 2008 · f40b121 · f40b121
1 parent dcea83a
commit f40b121
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/arch/arm/include/asm/dma.h b/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/arch/arm/mach-footbridge/include/mach/dma.h → ...rm/mach-footbridge/include/mach/isa-dma.h b/arch/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/arch/arm/mach-h720x/include/mach/dma.h → arch/arm/mach-h720x/include/mach/isa-dma.h b/arch/arm/mach-h720x/include/mach/dma.h → arch/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/arch/arm/mach-rpc/include/mach/dma.h → arch/arm/mach-rpc/include/mach/isa-dma.h b/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/arch/arm/mach-shark/include/mach/dma.h → arch/arm/mach-shark/include/mach/isa-dma.h b/arch/arm/mach-shark/include/mach/dma.h → arch/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
  */