Merge branch 'master' into for-next

[linux-imx.git] / include / linux / dma-buf.h

diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index bd2e52ccc4f24a7345c5eceaa698f3b2dc03ea82..3d754a394e921a6f9e1e0cdc7b62c28df80f29c0 100644 (file)
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -53,7 +53,7 @@ struct dma_buf_attachment;
  * @begin_cpu_access: [optional] called before cpu access to invalidate cpu
  *                   caches and allocate backing storage (if not yet done)
  *                   respectively pin the objet into memory.
- * @end_cpu_access: [optional] called after cpu access to flush cashes.
+ * @end_cpu_access: [optional] called after cpu access to flush caches.
  * @kmap_atomic: maps a page from the buffer into kernel address
  *              space, users may not block until the subsequent unmap call.
  *              This callback must not sleep.