summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos/mach-smdkv310.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-19 12:34:05 (GMT)
committerArnd Bergmann <arnd@arndb.de>2013-04-19 14:50:56 (GMT)
commit0dc488e778069b208d09516c5f0793dc37023c8e (patch)
tree704ad7fa4d8202f1933297e4dd348128a2b9f702 /arch/arm/mach-exynos/mach-smdkv310.c
parentc4c54da24b8ae12abb2034edaf08021894caf0d0 (diff)
parentbd51de53e1be9896d815bbea30560262216d4616 (diff)
downloadlinux-fsl-qoriq-0dc488e778069b208d09516c5f0793dc37023c8e.tar.xz
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of pointless conflicts with code changed here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdkv310.c')
-rw-r--r--arch/arm/mach-exynos/mach-smdkv310.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 75eca7d..ee312b6 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -43,6 +43,7 @@
#include <plat/clock.h>
#include <plat/hdmi.h>
+#include <mach/irqs.h>
#include <mach/map.h>
#include <drm/exynos_drm.h>