summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si_smc.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-01 19:31:53 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-01 19:31:53 +0100
commit04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch)
treed2f803b4eef6108648f1beee6bf97a342cd9bc73 /drivers/gpu/drm/radeon/si_smc.c
parentInput: imx_keypad - Propagate the real error code on platform_get_irq() failure (diff)
parentLinux 3.14-rc4 (diff)
downloadlinux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.xz
linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.zip
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'drivers/gpu/drm/radeon/si_smc.c')
-rw-r--r--drivers/gpu/drm/radeon/si_smc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si_smc.c b/drivers/gpu/drm/radeon/si_smc.c
index d422a1cbf727..e80efcf0c230 100644
--- a/drivers/gpu/drm/radeon/si_smc.c
+++ b/drivers/gpu/drm/radeon/si_smc.c
@@ -28,6 +28,7 @@
#include "sid.h"
#include "ppsmc.h"
#include "radeon_ucode.h"
+#include "sislands_smc.h"
static int si_set_smc_sram_address(struct radeon_device *rdev,
u32 smc_address, u32 limit)