diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:40:24 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:40:24 -0400 |
commit | 45c8fa878475b16467109cf6534af03b27e28d10 (patch) | |
tree | a7c66c65dbc38774dcbba0d2965b1f851fcc1578 /arch/arm/plat-samsung/include/plat/devs.h | |
parent | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (diff) | |
parent | ef2f07d31c6b890e0cc3966d4a27fa1d49b740f5 (diff) |
ARM: Merge for-2635-4/spi-devs
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/devs.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index fed082a28ad..8d516d49805 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
@@ -58,6 +58,14 @@ extern struct platform_device s3c_device_hsmmc2; | |||
58 | extern struct platform_device s3c_device_spi0; | 58 | extern struct platform_device s3c_device_spi0; |
59 | extern struct platform_device s3c_device_spi1; | 59 | extern struct platform_device s3c_device_spi1; |
60 | 60 | ||
61 | extern struct platform_device s5pc100_device_spi0; | ||
62 | extern struct platform_device s5pc100_device_spi1; | ||
63 | extern struct platform_device s5pc100_device_spi2; | ||
64 | extern struct platform_device s5pv210_device_spi0; | ||
65 | extern struct platform_device s5pv210_device_spi1; | ||
66 | extern struct platform_device s5p6440_device_spi0; | ||
67 | extern struct platform_device s5p6440_device_spi1; | ||
68 | |||
61 | extern struct platform_device s3c_device_hwmon; | 69 | extern struct platform_device s3c_device_hwmon; |
62 | 70 | ||
63 | extern struct platform_device s3c_device_nand; | 71 | extern struct platform_device s3c_device_nand; |
@@ -77,6 +85,7 @@ extern struct platform_device s5p6442_device_pcm0; | |||
77 | extern struct platform_device s5p6442_device_pcm1; | 85 | extern struct platform_device s5p6442_device_pcm1; |
78 | extern struct platform_device s5p6442_device_iis0; | 86 | extern struct platform_device s5p6442_device_iis0; |
79 | extern struct platform_device s5p6442_device_iis1; | 87 | extern struct platform_device s5p6442_device_iis1; |
88 | extern struct platform_device s5p6442_device_spi; | ||
80 | 89 | ||
81 | extern struct platform_device s5p6440_device_pcm; | 90 | extern struct platform_device s5p6440_device_pcm; |
82 | extern struct platform_device s5p6440_device_iis; | 91 | extern struct platform_device s5p6440_device_iis; |