diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-28 14:31:53 -0500 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-28 14:31:53 -0500 |
| commit | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch) | |
| tree | 80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/devices-msm7x00.c | |
| parent | d1f4cec78ee3141a78b2b35969f5bebf7ea9b208 (diff) | |
| parent | 07a3cc4814f790354d4c7be2c9dc6143a714a07a (diff) | |
Merge branch 'msm-core' into for-next
* msm-core:
msm: Clean up useless ifdefs
msm: clock: Add support for more proc_comm clocks
msm: clock: Invert debugfs directory layout
msm: clock: Move debugfs code from clock.c to clock-debug.c
msm: clock: Remove 7x30 and pcom includes from clock.h
msm: clock: Remove unused code and definitions
msm: Warning fix in trout gpio board file
msm: Remove broken register definition from trout
Diffstat (limited to 'arch/arm/mach-msm/devices-msm7x00.c')
| -rw-r--r-- | arch/arm/mach-msm/devices-msm7x00.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c index 2549fb23ee9e..ed62806559e7 100644 --- a/arch/arm/mach-msm/devices-msm7x00.c +++ b/arch/arm/mach-msm/devices-msm7x00.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "clock-pcom.h" | ||
| 29 | #include <mach/mmc.h> | 30 | #include <mach/mmc.h> |
| 30 | 31 | ||
| 31 | static struct resource resources_uart1[] = { | 32 | static struct resource resources_uart1[] = { |