Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[deliverable/linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_acp.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h
index f6e32a63910749d47fe852ebd57aa666241dad79..8a396313c86f8fc7b8a2bc2c7617a167f401e201 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h
@@ -30,7 +30,7 @@
 
 struct amdgpu_acp {
        struct device *parent;
-       void *cgs_device;
+       struct cgs_device *cgs_device;
        struct amd_acp_private *private;
        struct mfd_cell *acp_cell;
        struct resource *acp_res;