aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c/include
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-19 18:36:04 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-19 18:36:04 +0900
commit9e157144afe81052f5abe122c2469e33a30d20a5 (patch)
tree167ea8d57d6a8d97edac64f8af744f38a8407a3e /arch/arm/plat-s3c/include
parentARM: Merge next-s3c6410-andygreen (diff)
parentARM: S3C64XX: SPI: Define SPI controller devices (diff)
downloadlinux-dev-9e157144afe81052f5abe122c2469e33a30d20a5.tar.xz
linux-dev-9e157144afe81052f5abe122c2469e33a30d20a5.zip
ARM: Merge next-jassi-spi
Merge branch 'next-jassi-spi' into next-samsung-try7
Diffstat (limited to 'arch/arm/plat-s3c/include')
-rw-r--r--arch/arm/plat-s3c/include/plat/devs.h3
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;
extern struct platform_device s3c64xx_device_iis1;
extern struct platform_device s3c64xx_device_iisv4;
+extern struct platform_device s3c64xx_device_spi0;
+extern struct platform_device s3c64xx_device_spi1;
+
extern struct platform_device s3c64xx_device_pcm0;
extern struct platform_device s3c64xx_device_pcm1;