Merge branch 'topic/of' into for-linus

926a3ffe · Vinod Koul · 212dac56 · 9290a16c · 926a3ffe
Commit 926a3ffe authored Oct 31, 2015 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/linux/of_dma.h include/linux/of_dma.h +1 -1

No files found.
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -34,7 +34,7 @@ struct of_dma_filter_info {
 	dma_filter_fn	filter_fn;
 };

-#ifdef CONFIG_OF
+#ifdef CONFIG_DMA_OF
 extern int of_dma_controller_register(struct device_node *np,
 		struct dma_chan *(*of_dma_xlate)
 		(struct of_phandle_args *, struct of_dma *),