diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:38:30 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:38:30 -0400 |
| commit | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (patch) | |
| tree | ed60f11843face3b8b2016d9adea36a8d709bb6b /arch/arm/plat-samsung/include | |
| parent | ea5a4e209ddca984bbb5803b30d5e013e631f9ac (diff) | |
| parent | 99c56e0ce1c11221948c7da127b0bbe1641cbe41 (diff) | |
ARM: Merge for-2635-4/s5p-devs
Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
Diffstat (limited to 'arch/arm/plat-samsung/include')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 78d24202f4e4..fed082a28ad9 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
| @@ -81,6 +81,13 @@ extern struct platform_device s5p6442_device_iis1; | |||
| 81 | extern struct platform_device s5p6440_device_pcm; | 81 | extern struct platform_device s5p6440_device_pcm; |
| 82 | extern struct platform_device s5p6440_device_iis; | 82 | extern struct platform_device s5p6440_device_iis; |
| 83 | 83 | ||
| 84 | extern struct platform_device s5pc100_device_ac97; | ||
| 85 | extern struct platform_device s5pc100_device_pcm0; | ||
| 86 | extern struct platform_device s5pc100_device_pcm1; | ||
| 87 | extern struct platform_device s5pc100_device_iis0; | ||
| 88 | extern struct platform_device s5pc100_device_iis1; | ||
| 89 | extern struct platform_device s5pc100_device_iis2; | ||
| 90 | |||
| 84 | /* s3c2440 specific devices */ | 91 | /* s3c2440 specific devices */ |
| 85 | 92 | ||
| 86 | #ifdef CONFIG_CPU_S3C2440 | 93 | #ifdef CONFIG_CPU_S3C2440 |