diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:04 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:04 -0500 |
| commit | 9e157144afe81052f5abe122c2469e33a30d20a5 (patch) | |
| tree | 167ea8d57d6a8d97edac64f8af744f38a8407a3e /arch/arm/plat-s3c | |
| parent | 44d6cef805c1b17218723279a2767484e43d6fac (diff) | |
| parent | 6a2b4111643127a28944d673995810a82582c5a1 (diff) | |
ARM: Merge next-jassi-spi
Merge branch 'next-jassi-spi' into next-samsung-try7
Diffstat (limited to 'arch/arm/plat-s3c')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/devs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 8a4153b49f40..f4a7e57bab2b 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h | |||
| @@ -29,6 +29,9 @@ extern struct platform_device s3c64xx_device_iis0; | |||
| 29 | extern struct platform_device s3c64xx_device_iis1; | 29 | extern struct platform_device s3c64xx_device_iis1; |
| 30 | extern struct platform_device s3c64xx_device_iisv4; | 30 | extern struct platform_device s3c64xx_device_iisv4; |
| 31 | 31 | ||
| 32 | extern struct platform_device s3c64xx_device_spi0; | ||
| 33 | extern struct platform_device s3c64xx_device_spi1; | ||
| 34 | |||
| 32 | extern struct platform_device s3c64xx_device_pcm0; | 35 | extern struct platform_device s3c64xx_device_pcm0; |
| 33 | extern struct platform_device s3c64xx_device_pcm1; | 36 | extern struct platform_device s3c64xx_device_pcm1; |
| 34 | 37 | ||