Merge branch 'topic/of' into for-linus
This commit is contained in:
commit
926a3ffe34
1 changed files with 1 additions and 1 deletions
|
@ -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 *),
|
||||
|
|
Loading…
Reference in a new issue