Merge remote-tracking branch 'dt-rh/for-next'

[karo-tx-linux.git] / drivers / gpu / host1x / job.c

diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
index 63bd63f3c7dfd2da2fd3d9ae58bba1473bceb70b..1919aab88c3f412a10fa22fd5d85557f0e38a9a0 100644 (file)
--- a/drivers/gpu/host1x/job.c
+++ b/drivers/gpu/host1x/job.c
@@ -225,7 +225,7 @@ unpin:
        return 0;
 }
 
-static unsigned int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf)
+static int do_relocs(struct host1x_job *job, struct host1x_bo *cmdbuf)
 {
        int i = 0;
        u32 last_page = ~0;