Hi Dan,
Today's linux-next merge of the dmaengine tree got a conflict in
include/linux/dmaengine.h between commit 7bb587f4eef8 ("dmaengine: add
interface of dma_get_slave_channel") from the slave-dma tree and commit
4a43f394a082 ("dmaengine: dma_sync_wait and dma_find_channel undefined")
from the dmaengine tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/dmaengine.h
index 2601186,0c72b89..0000000
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -1030,8 -1006,6 +1042,7 @@@ static inline void dma_release_channel(
int dma_async_device_register(struct dma_device *device);
void dma_async_device_unregister(struct dma_device *device);
void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
- struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
+struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
struct dma_chan *net_dma_find_channel(void);
#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
#define dma_request_slave_channel_compat(mask, x, y, dev, name) \
Attachment:
pgpZY1UJUrfh4.pgp
Description: PGP signature
