diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | |
parent | Input: remove w90x900 touchscreen driver (diff) | |
parent | Linux 5.3-rc4 (diff) | |
download | linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.xz linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.zip |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h')
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h index bdef1587b0a0..5e5b2b2afa31 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h @@ -29,7 +29,7 @@ #include "amdgpu.h" #include "amdgpu_dm.h" -int connector_debugfs_init(struct amdgpu_dm_connector *connector); +void connector_debugfs_init(struct amdgpu_dm_connector *connector); int dtn_debugfs_init(struct amdgpu_device *adev); #endif |