diff options
author | Slava Grigorev <slava.grigorev@amd.com> | 2014-12-22 17:26:51 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-01-22 10:38:59 -0500 |
commit | bfc1f97d8ac5d3dc6f7ded64ba9adbac371e912c (patch) | |
tree | a7d965803e57ca2736d37bbc1b6605fcb0d66f19 /drivers/gpu/drm/radeon/rs690.c | |
parent | 49ead33b9f0e0ba0b528951a05986486196848ef (diff) |
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/rs690.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs690.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 0a2d36e81108..0fc559221933 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "radeon_asic.h" | 30 | #include "radeon_asic.h" |
31 | #include "radeon_audio.h" | ||
31 | #include "atom.h" | 32 | #include "atom.h" |
32 | #include "rs690d.h" | 33 | #include "rs690d.h" |
33 | 34 | ||
@@ -729,7 +730,7 @@ static int rs690_startup(struct radeon_device *rdev) | |||
729 | return r; | 730 | return r; |
730 | } | 731 | } |
731 | 732 | ||
732 | r = r600_audio_init(rdev); | 733 | r = radeon_audio_init(rdev); |
733 | if (r) { | 734 | if (r) { |
734 | dev_err(rdev->dev, "failed initializing audio\n"); | 735 | dev_err(rdev->dev, "failed initializing audio\n"); |
735 | return r; | 736 | return r; |