diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-msm/devices-qsd8x50.c | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
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 = { | |||
| 48 | .resource = resources_uart3, | 48 | .resource = resources_uart3, |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | struct platform_device msm_device_smd = { | ||
| 52 | .name = "msm_smd", | ||
| 53 | .id = -1, | ||
| 54 | }; | ||
| 55 | |||
| 51 | struct clk msm_clocks_8x50[] = { | 56 | struct clk msm_clocks_8x50[] = { |
| 52 | CLK_PCOM("adm_clk", ADM_CLK, NULL, 0), | 57 | CLK_PCOM("adm_clk", ADM_CLK, NULL, 0), |
| 53 | CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN), | 58 | CLK_PCOM("ebi1_clk", EBI1_CLK, NULL, CLK_MIN), |