---

yaml --- r: 22859 b: refs/heads/master c: 3a2916a h: refs/heads/master i: 22857: f1da56e 22855: 8ab6a43 v: v3
git-mirror · Mar 22, 2006 · e1a4127 · e1a4127
1 parent 1802df6
commit e1a4127
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69b648a200b27a7c8ea92993bf5b4d40e83b5403
+refs/heads/master: 3a2916aa289504d694072a98876d23ca31d6401e
diff --git a/trunk/arch/arm/common/dmabounce.c b/trunk/arch/arm/common/dmabounce.c
@@ -5,7 +5,7 @@
  *  limited DMA windows. These functions utilize bounce buffers to
  *  copy data to/from buffers located outside the DMA region. This
  *  only works for systems in which DMA memory is at the bottom of
- *  RAM and the remainder of memory is at the top an the DMA memory
+ *  RAM, the remainder of memory is at the top and the DMA memory
  *  can be marked as ZONE_DMA. Anything beyond that such as discontigous
  *  DMA windows will require custom implementations that reserve memory
  *  areas at early bootup.