diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 10:07:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 10:07:32 -0700 |
| commit | ce4327d372af7e2f2d403286e9904ab012e72827 (patch) | |
| tree | aa95c33aa9277d3ecb4d7c46cee13c8b59611c7c /arch/arm/mach-msm/board-trout.c | |
| parent | 4032816dca04141e3d49ec4ed717c9f7cc5444c5 (diff) | |
| parent | b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (diff) | |
| download | talos-obmc-linux-ce4327d372af7e2f2d403286e9904ab012e72827.tar.gz talos-obmc-linux-ce4327d372af7e2f2d403286e9904ab012e72827.zip | |
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
msm: mmc: Add msm prefix to platform data structure
msm: trout: Remove extern declaration from source file
arm: msm: Fix section mismatch in smd.c.
arm: msm: trout add mmc support
arm: msm: trout: add trout specific gpio interrupts
arm: msm: remove unused #include <linux/version.h>
Diffstat (limited to 'arch/arm/mach-msm/board-trout.c')
| -rw-r--r-- | arch/arm/mach-msm/board-trout.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index e69a1502e4e8..469e0be3499d 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -30,6 +30,8 @@ #include "devices.h" #include "board-trout.h" +extern int trout_init_mmc(unsigned int); + static struct platform_device *devices[] __initdata = { &msm_device_uart3, &msm_device_smd, @@ -55,7 +57,16 @@ static void __init trout_fixup(struct machine_desc *desc, struct tag *tags, static void __init trout_init(void) { + int rc; + platform_add_devices(devices, ARRAY_SIZE(devices)); + +#ifdef CONFIG_MMC + rc = trout_init_mmc(system_rev); + if (rc) + printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc); +#endif + } static struct map_desc trout_io_desc[] __initdata = { |
