Merge branch 'i2c/for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[sfrench/cifs-2.6.git] / include / linux / dma-buf.h

diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index e0b0741ae67199d48045d97a0adbffdab1c894ca..8daeb3ce00163c1487def6fc39a78b1fcd2e1b40 100644 (file)
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -30,7 +30,7 @@
 #include <linux/list.h>
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
-#include <linux/fence.h>
+#include <linux/dma-fence.h>
 #include <linux/wait.h>
 
 struct device;
@@ -143,7 +143,7 @@ struct dma_buf {
        wait_queue_head_t poll;
 
        struct dma_buf_poll_cb_t {
-               struct fence_cb cb;
+               struct dma_fence_cb cb;
                wait_queue_head_t *poll;
 
                unsigned long active;