From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 8 Nov 2013 18:03:47 +0000 (-0500)
Subject: drm/radeon: fix mismerge of drm-next with 3.12
X-Git-Tag: v3.13-rc1~76^2~8^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31fadd372e9e0d00f25b000c41fa63531ca488e;p=pandora-kernel.git

drm/radeon: fix mismerge of drm-next with 3.12

Audio is enabled by default now.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

Reading git-diff-tree failed