From 1515a47b44c8667987d070fdc494691f91b44b46 Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Wed, 26 Jul 2017 19:31:53 -0400 Subject: drm/amd/display: Rename firmware_info to dc_firmware_info This is to avoid conflicts with amdgpu's firmware_info once we merge amdgpu_dm_types with amdgpu_dm. Signed-off-by: Harry Wentland Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c') diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c index cc25c4b6c06f..5c1790b61290 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c @@ -1190,7 +1190,7 @@ static bool construct( { unsigned int i; struct dc_context *ctx = dc->ctx; - struct firmware_info info; + struct dc_firmware_info info; struct dc_bios *bp; struct dm_pp_static_clock_info static_clk_info = {0}; -- cgit v1.2.3-55-g7522