diff --git a/[refs] b/[refs]
index a724a0375959..26a59cd1c6b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73a59c1c4af06c675a168d698d3ebfbb3270ddbe
+refs/heads/master: 8ef12c9f01afba47c2d33bb939085111ca0d0f7d
diff --git a/trunk/include/asm-arm/arch-at91rm9200/dma.h b/trunk/include/asm-arm/arch-at91rm9200/dma.h
index 6738bdd74b22..22c1dfdd8da3 100644
--- a/trunk/include/asm-arm/arch-at91rm9200/dma.h
+++ b/trunk/include/asm-arm/arch-at91rm9200/dma.h
@@ -17,11 +17,3 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define MAX_DMA_ADDRESS		0xffffffff
-#define MAX_DMA_CHANNELS	0
-
-#endif /* _ASM_ARCH_DMA_H */