diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:44:13 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:44:13 -0500 |
| commit | 724c35cf530651f68f5958dc02e0b49ac6661226 (patch) | |
| tree | 7511b55f0efc07495a559f48b3071a34f0bfaff3 /arch/arm/plat-samsung | |
| parent | 57ca51514905b7aea532977e4e87e989d33bfcbb (diff) | |
| parent | 3bbef1b912df64a86a86e402d7686a8ed38abaf4 (diff) | |
Merge branch 'next-s5p' into for-next-new
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 3 |
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; | |||
| 133 | extern struct platform_device s5p_device_fimc1; | 133 | extern struct platform_device s5p_device_fimc1; |
| 134 | extern struct platform_device s5p_device_fimc2; | 134 | extern struct platform_device s5p_device_fimc2; |
| 135 | 135 | ||
| 136 | extern struct platform_device s5p_device_mipi_csis0; | ||
| 137 | extern struct platform_device s5p_device_mipi_csis1; | ||
| 138 | |||
| 136 | /* s3c2440 specific devices */ | 139 | /* s3c2440 specific devices */ |
| 137 | 140 | ||
| 138 | #ifdef CONFIG_CPU_S3C2440 | 141 | #ifdef CONFIG_CPU_S3C2440 |