Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 926a3ffe authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/of' into for-linus

parents 212dac56 9290a16c

include/linux/of_dma.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *),