Merge branch 'topic/of' into for-linus

git-mirror · Oct 31, 2015 · 926a3ff · 926a3ff
2 parents 212dac5 + 9290a16
commit 926a3ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 *),