From 8c6a9fd1151299697037d58f33cfa306d8ac5d87 Mon Sep 17 00:00:00 2001 From: Sam Payne Date: Fri, 31 Oct 2014 14:27:33 -0700 Subject: Revert "gpu: nvgpu: GR and LTC HAL to use const structs" This reverts commit 41b82e97164138f45fbdaef6ab6939d82ca9419e. Change-Id: Iabd01fcb124e0d22cd9be62151a6552cbb27fc94 Signed-off-by: Sam Payne Reviewed-on: http://git-master/r/592221 Tested-by: Hoang Pham GVS: Gerrit_Virtual_Submit Reviewed-by: Mitch Luban --- drivers/gpu/nvgpu/vgpu/vgpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/vgpu.c') diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 11fa73c5..84fd6d18 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -21,7 +21,6 @@ #include "gk20a/debug_gk20a.h" #include "gk20a/hal_gk20a.h" #include "gk20a/hw_mc_gk20a.h" -#include "nvgpu_gpuid.h" static inline int vgpu_comm_init(struct platform_device *pdev) { @@ -240,7 +239,7 @@ static int vgpu_init_hal(struct gk20a *g) u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; switch (ver) { - case NVGPU_GPUID_GK20A: + case GK20A_GPUID_GK20A: gk20a_dbg_info("gk20a detected"); /* init gk20a ops then override with virt extensions */ gk20a_init_hal(&g->ops); -- cgit v1.2.2