---

yaml --- r: 116808 b: refs/heads/master c: 957cf33 h: refs/heads/master v: v3
git-mirror · Oct 17, 2008 · d8d3dfa · d8d3dfa
1 parent 82fcc90
commit d8d3dfa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f53aafb60ebc3a26e5508e0e87bfc88c703654
+refs/heads/master: 957cf333b5284943c4866e1d0339a105d2762c9c
diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c
@@ -581,6 +581,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 		goto out;
 	}
 
+#ifdef CONFIG_DMABOUNCE
 	/*
 	 * If the parent device has a DMA mask associated with it,
 	 * propagate it down to the children.
@@ -598,6 +599,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 			}
 		}
 	}
+#endif
 
 out:
 	return ret;