aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include/plat/devs.h
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-12-30 10:44:13 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-12-30 10:44:13 +0900
commit724c35cf530651f68f5958dc02e0b49ac6661226 (patch)
tree7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/plat-samsung/include/plat/devs.h
parentMerge branch 'next-samsung' into for-next-new (diff)
parentARM: S5P: Add platform support for MIPI CSIS devices (diff)
downloadlinux-dev-724c35cf530651f68f5958dc02e0b49ac6661226.tar.xz
linux-dev-724c35cf530651f68f5958dc02e0b49ac6661226.zip
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 126196e9983b..94794c816b0e 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