aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinod Koul <[email protected]>2015-10-31 07:37:21 +0530
committerVinod Koul <[email protected]>2015-10-31 07:37:21 +0530
commit926a3ffe346a2e47fe35ace004cbea52587688eb (patch)
treeed366befb747714cd6e9e7f0033e52ecbf8d3b0c
parent212dac5665cc4b7329537d932362f31a481cef3b (diff)
parent9290a16cf19301224556bc7bcb913c0c2a45bb9a (diff)
Merge branch 'topic/of' into for-linus
-rw-r--r--include/linux/of_dma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 98ba7525929e..36112cdd665a 100644
--- 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 *),