diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 11:58:20 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 11:59:07 -0700 |
| commit | 9935448e207cc9e7e5fd3c6aa3282ff503f263c4 (patch) | |
| tree | a43f75f5dd940664f468418d59d3879ffff75b8f /arch/powerpc/include/asm/powernv.h | |
| parent | 41a5985f173bf1f93d2634fc93d8aa53683067f9 (diff) | |
| parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
| download | linux-9935448e207cc9e7e5fd3c6aa3282ff503f263c4.tar.gz linux-9935448e207cc9e7e5fd3c6aa3282ff503f263c4.tar.bz2 linux-9935448e207cc9e7e5fd3c6aa3282ff503f263c4.zip | |
Merge tag 'v4.17-rc4' into rproc-next
Pick up fixes from rproc-v4.17-1
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'arch/powerpc/include/asm/powernv.h')
| -rw-r--r-- | arch/powerpc/include/asm/powernv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/powernv.h b/arch/powerpc/include/asm/powernv.h index d1c2d2e658cf..2f3ff7a27881 100644 --- a/arch/powerpc/include/asm/powernv.h +++ b/arch/powerpc/include/asm/powernv.h @@ -15,7 +15,7 @@ extern void powernv_set_nmmu_ptcr(unsigned long ptcr); extern struct npu_context *pnv_npu2_init_context(struct pci_dev *gpdev, unsigned long flags, - struct npu_context *(*cb)(struct npu_context *, void *), + void (*cb)(struct npu_context *, void *), void *priv); extern void pnv_npu2_destroy_context(struct npu_context *context, struct pci_dev *gpdev); |