summaryrefslogtreecommitdiff
path: root/arch/arm/plat-samsung/include/plat/devs.h
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-12-30 01:44:13 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2010-12-30 01:44:13 (GMT)
commit724c35cf530651f68f5958dc02e0b49ac6661226 (patch)
tree7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/plat-samsung/include/plat/devs.h
parent57ca51514905b7aea532977e4e87e989d33bfcbb (diff)
parent3bbef1b912df64a86a86e402d7686a8ed38abaf4 (diff)
downloadlinux-fsl-qoriq-724c35cf530651f68f5958dc02e0b49ac6661226.tar.xz
Merge branch 'next-s5p' into for-next-new
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/devs.h')
-rw-r--r--arch/arm/plat-samsung/include/plat/devs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index 126196e..94794c8 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -133,6 +133,9 @@ extern struct platform_device s5p_device_fimc0;
extern struct platform_device s5p_device_fimc1;
extern struct platform_device s5p_device_fimc2;
+extern struct platform_device s5p_device_mipi_csis0;
+extern struct platform_device s5p_device_mipi_csis1;
+
/* s3c2440 specific devices */
#ifdef CONFIG_CPU_S3C2440