diff --git a/[refs] b/[refs] index 43d0b6cff959..f48f8e053fa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3464f114967b2f98f1bfe0eaf0a413bb51b4df1d +refs/heads/master: 6d9c13513661c1991bf5f4e6e1363c721292d819 diff --git a/trunk/drivers/gpu/drm/radeon/r600_audio.c b/trunk/drivers/gpu/drm/radeon/r600_audio.c index 58c3cb32f7b0..db928016d034 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_audio.c +++ b/trunk/drivers/gpu/drm/radeon/r600_audio.c @@ -270,7 +270,6 @@ void r600_audio_fini(struct radeon_device *rdev) return; del_timer(&rdev->audio_timer); - WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000); r600_audio_engine_enable(rdev, false); }