diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
| commit | 4cff7adbebf4d25f662b13c6582b945d9d549e25 (patch) | |
| tree | cfb6bc0aaab6ad7fa7ca2bb07453ed2fd139138c /drivers/gpu/drm/radeon/radeon_audio.h | |
| parent | 7e3933df9874b70745548ce9177295d11c58fc21 (diff) | |
| parent | 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 (diff) | |
| download | linux-4cff7adbebf4d25f662b13c6582b945d9d549e25.tar.xz | |
Merge 4.5-rc2 into staging-next
This fixes a merge issue with the panel driver, and picks up fixes in
iio and other drivers that we want here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_audio.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_audio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h index 059cc30..5c70cce 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.h +++ b/drivers/gpu/drm/radeon/radeon_audio.h @@ -79,5 +79,6 @@ void radeon_audio_fini(struct radeon_device *rdev); void radeon_audio_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode); void radeon_audio_dpms(struct drm_encoder *encoder, int mode); +unsigned int radeon_audio_decode_dfs_div(unsigned int div); #endif |