diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ltc_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_common.c b/drivers/gpu/nvgpu/gk20a/ltc_common.c index 8f9bd8c2..ae828680 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_common.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_common.c | |||
@@ -342,3 +342,5 @@ static void gk20a_mm_g_elpg_flush_locked(struct gk20a *g) | |||
342 | "g_elpg_flush too many retries"); | 342 | "g_elpg_flush too many retries"); |
343 | 343 | ||
344 | } | 344 | } |
345 | ======= | ||
346 | >>>>>>> 7294a959b260... video: tegra: host: comptag init and clear | ||