diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 23:06:36 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 23:06:36 +0200 |
commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-msm/devices-qsd8x50.c | |
parent | Merge branch 'hotplug' into devel (diff) | |
parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
download | linux-809b4e00baf006a990a73329ba381d536c6fa277.tar.xz linux-809b4e00baf006a990a73329ba381d536c6fa277.zip |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-msm/devices-qsd8x50.c')
-rw-r--r-- | arch/arm/mach-msm/devices-qsd8x50.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c index 4d4a50785e34..6fe67c5d1ae0 100644 --- a/arch/arm/mach-msm/devices-qsd8x50.c +++ b/arch/arm/mach-msm/devices-qsd8x50.c @@ -48,6 +48,11 @@ struct platform_device msm_device_uart3 = { .resource = resources_uart3, }; +struct platform_device msm_device_smd = { + .name = "msm_smd", + .id = -1, +}; + struct clk msm_clocks_8x50[] = { CLK_PCOM("adm_clk", ADM_CLK, NULL, 0), CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN), |