diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 23:15:10 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 23:15:10 +1100 |
| commit | d0055df0c9c1471c389197a69f43e300185a75aa (patch) | |
| tree | 7a1c253162f9ea99bf544fac4ae9219c398cae3f /arch/powerpc/kernel/setup-common.c | |
| parent | Merge branch 'fixes' into next (diff) | |
| parent | powerpc/dma: trim the fat from <asm/dma-mapping.h> (diff) | |
| download | linux-dev-d0055df0c9c1471c389197a69f43e300185a75aa.tar.xz linux-dev-d0055df0c9c1471c389197a69f43e300185a75aa.zip | |
Merge branch 'topic/dma' into next
Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index ca00fbb97cf8..fa606aa98f6d 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -791,7 +791,6 @@ void arch_setup_pdev_archdata(struct platform_device *pdev) { pdev->archdata.dma_mask = DMA_BIT_MASK(32); pdev->dev.dma_mask = &pdev->archdata.dma_mask; - set_dma_ops(&pdev->dev, &dma_nommu_ops); } static __init void print_system_info(void) |