diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 20:52:05 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 20:52:05 -0500 |
| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /arch/arm/plat-samsung | |
| parent | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 (diff) | |
| parent | fa353e9f409340cefc7650854065cbcea85c347d (diff) | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 94794c816b0e..165fa8496c9e 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
| @@ -104,6 +104,7 @@ extern struct platform_device s5pv310_device_i2s0; | |||
| 104 | extern struct platform_device s5pv310_device_i2s1; | 104 | extern struct platform_device s5pv310_device_i2s1; |
| 105 | extern struct platform_device s5pv310_device_i2s2; | 105 | extern struct platform_device s5pv310_device_i2s2; |
| 106 | extern struct platform_device s5pv310_device_spdif; | 106 | extern struct platform_device s5pv310_device_spdif; |
| 107 | extern struct platform_device s5pv310_device_pd[]; | ||
| 107 | 108 | ||
| 108 | extern struct platform_device s5p6442_device_pcm0; | 109 | extern struct platform_device s5p6442_device_pcm0; |
| 109 | extern struct platform_device s5p6442_device_pcm1; | 110 | extern struct platform_device s5p6442_device_pcm1; |