diff options
author | Con Kolivas <kernel@kolivas.org> | 2016-12-12 10:56:17 +1100 |
---|---|---|
committer | Con Kolivas <kernel@kolivas.org> | 2016-12-12 10:56:17 +1100 |
commit | c3e1d5cbf048128fa788513fbc5fa3036c85fcb0 (patch) | |
tree | 4b2b38cc960963abc48b2e30c6e2415ee383c98d /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | e4d2e01f84338d948be51202038842fe3e0f6ce9 (diff) | |
parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) |
Merge tag 'v4.9' into 4.9-muqss4.9-muqss-150
Linux 4.9
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 3161d77bf299..e41d4baebf86 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1493,7 +1493,7 @@ static int amdgpu_fini(struct amdgpu_device *adev) return 0; } -static int amdgpu_suspend(struct amdgpu_device *adev) +int amdgpu_suspend(struct amdgpu_device *adev) { int i, r; |