diff options
author | Slava Grigorev <slava.grigorev@amd.com> | 2014-12-22 23:26:51 +0100 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-01-22 16:38:59 +0100 |
commit | bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c (patch) | |
tree | a7d965803e57ca2736d37bbc1b6605fcb0d66f19 /drivers/gpu/drm/radeon/r600.c | |
parent | drm/radeon: comment out some currently unused 7xx dpm code (diff) | |
download | linux-bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c.tar.xz linux-bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c.zip |
radeon/audio: consolidate audio_init() functions
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index ef5d6066fa5b..de7878aef65c 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -33,6 +33,7 @@ #include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_asic.h" +#include "radeon_audio.h" #include "radeon_mode.h" #include "r600d.h" #include "atom.h" @@ -3054,7 +3055,7 @@ static int r600_startup(struct radeon_device *rdev) return r; } - r = r600_audio_init(rdev); + r = radeon_audio_init(rdev); if (r) { DRM_ERROR("radeon: audio init failed\n"); return r; |