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

Commit 13ab2c80 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux into fixes

ARM: pxa: fixes for v4.6

There is only a single fix for dma requestor lines initial
setup, triggered by dmaengine previous fix.

* tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux

:
  ARM: pxa: fix the number of DMA requestor lines

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2e1d18c6 4c35430a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1235,5 +1235,6 @@ static struct platform_device pxa2xx_pxa_dma = {
void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)
{
	pxa_dma_pdata.dma_channels = nb_channels;
	pxa_dma_pdata.nb_requestors = nb_requestors;
	pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);
}