diff --git a/[refs] b/[refs]
index c7fb569cfed7..494bb485dbe6 100644
--- 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
index 06419980dde7..df5638f3643a 100644
--- 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/trunk/arch/arm/mach-footbridge/include/mach/dma.h b/trunk/arch/arm/mach-footbridge/include/mach/isa-dma.h
similarity index 91%
rename from trunk/arch/arm/mach-footbridge/include/mach/dma.h
rename to trunk/arch/arm/mach-footbridge/include/mach/isa-dma.h
index 62afd213effb..5bd4a0d338a8 100644
--- a/trunk/arch/arm/mach-footbridge/include/mach/dma.h
+++ b/trunk/arch/arm/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 b/trunk/arch/arm/mach-h720x/include/mach/isa-dma.h
similarity index 87%
rename from trunk/arch/arm/mach-h720x/include/mach/dma.h
rename to trunk/arch/arm/mach-h720x/include/mach/isa-dma.h
index 2d7c77a9792a..3eafb3f163c0 100644
--- a/trunk/arch/arm/mach-h720x/include/mach/dma.h
+++ b/trunk/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/trunk/arch/arm/mach-rpc/include/mach/dma.h b/trunk/arch/arm/mach-rpc/include/mach/isa-dma.h
similarity index 92%
rename from trunk/arch/arm/mach-rpc/include/mach/dma.h
rename to trunk/arch/arm/mach-rpc/include/mach/isa-dma.h
index f0f8c9fb26bf..bad720548587 100644
--- a/trunk/arch/arm/mach-rpc/include/mach/dma.h
+++ b/trunk/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 b/trunk/arch/arm/mach-shark/include/mach/isa-dma.h
similarity index 86%
rename from trunk/arch/arm/mach-shark/include/mach/dma.h
rename to trunk/arch/arm/mach-shark/include/mach/isa-dma.h
index dfe1da0e5aca..864298ff3927 100644
--- a/trunk/arch/arm/mach-shark/include/mach/dma.h
+++ b/trunk/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
  */