Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 2 insertions, 2 deletions

diff --git a/include/asm-xtensa/dma-mapping.h b/include/asm-xtensa/dma-mapping.h
index c39c91dfcc69..82b03b3a2ee6 100644
--- a/include/asm-xtensa/dma-mapping.h
+++ b/include/asm-xtensa/dma-mapping.h
@@ -170,10 +170,10 @@ dma_get_cache_alignment(void)
         return L1_CACHE_BYTES;
 }
 
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         consistent_sync(vaddr, size, direction);