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/si.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/si.c')
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 5d89b874a1a2..86cdc6798240 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <drm/drmP.h> | 27 | #include <drm/drmP.h> |
28 | #include "radeon.h" | 28 | #include "radeon.h" |
29 | #include "radeon_asic.h" | 29 | #include "radeon_asic.h" |
30 | #include "radeon_audio.h" | ||
30 | #include <drm/radeon_drm.h> | 31 | #include <drm/radeon_drm.h> |
31 | #include "sid.h" | 32 | #include "sid.h" |
32 | #include "atom.h" | 33 | #include "atom.h" |
@@ -6869,7 +6870,7 @@ static int si_startup(struct radeon_device *rdev) | |||
6869 | return r; | 6870 | return r; |
6870 | } | 6871 | } |
6871 | 6872 | ||
6872 | r = dce6_audio_init(rdev); | 6873 | r = radeon_audio_init(rdev); |
6873 | if (r) | 6874 | if (r) |
6874 | return r; | 6875 | return r; |
6875 | 6876 | ||