Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / include / linux / scatterlist.h

diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index e5996984ddd0f9d8b242f9b7219e6f9006c35548..9aaf5bfdad1afcb5e85b39482ea0458a0ea6b83c 100644 (file)
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -242,6 +242,8 @@ size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents,
  */
 
 #define SG_MITER_ATOMIC                (1 << 0)         /* use kmap_atomic */
+#define SG_MITER_TO_SG         (1 << 1)        /* flush back to phys on unmap */
+#define SG_MITER_FROM_SG       (1 << 2)        /* nop */
 
 struct sg_mapping_iter {
        /* the following three fields can be accessed directly */