---

yaml --- r: 258404 b: refs/heads/master c: fded1ef h: refs/heads/master v: v3
git-mirror · Jul 18, 2011 · f410def · f410def
1 parent 11833a7
commit f410def
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9107ab623648587a044ee925c1708655bdf9813
+refs/heads/master: fded1ef9c55e30d91508487c45334c8947cc5f7b
diff --git a/trunk/arch/arm/mach-shark/core.c b/trunk/arch/arm/mach-shark/core.c
@@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark")
 	.map_io		= shark_map_io,
 	.init_irq	= shark_init_irq,
 	.timer		= &shark_timer,
+	.dma_zone_size	= SZ_4M,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-shark/include/mach/memory.h b/trunk/arch/arm/mach-shark/include/mach/memory.h
@@ -17,8 +17,6 @@
  */
 #define PLAT_PHYS_OFFSET     UL(0x08000000)
 
-#define ARM_DMA_ZONE_SIZE	SZ_4M
-
 /*
  * Cache flushing area
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,6 @@ @@
      */
     #define PLAT_PHYS_OFFSET     UL(0x08000000)
-    #define ARM_DMA_ZONE_SIZE	SZ_4M
     /*
      * Cache flushing area
      */
@@ Expand Down @@