diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-10-30 22:07:21 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-30 22:07:21 -0400 |
| commit | 926a3ffe346a2e47fe35ace004cbea52587688eb (patch) | |
| tree | ed366befb747714cd6e9e7f0033e52ecbf8d3b0c | |
| parent | 212dac5665cc4b7329537d932362f31a481cef3b (diff) | |
| parent | 9290a16cf19301224556bc7bcb913c0c2a45bb9a (diff) | |
Merge branch 'topic/of' into for-linus
| -rw-r--r-- | include/linux/of_dma.h | 2 |
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 { | |||
| 34 | dma_filter_fn filter_fn; | 34 | dma_filter_fn filter_fn; |
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | #ifdef CONFIG_OF | 37 | #ifdef CONFIG_DMA_OF |
| 38 | extern int of_dma_controller_register(struct device_node *np, | 38 | extern int of_dma_controller_register(struct device_node *np, |
| 39 | struct dma_chan *(*of_dma_xlate) | 39 | struct dma_chan *(*of_dma_xlate) |
| 40 | (struct of_phandle_args *, struct of_dma *), | 40 | (struct of_phandle_args *, struct of_dma *), |