diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:13:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:13:59 -0800 |
| commit | 88b1988ec2337f5fd8b9204a919838d0bc34b7b4 (patch) | |
| tree | cc6e781cd62a46ac8117f6838c95b805df639aad /arch/arm/mach-mxs/include | |
| parent | afd96f8335dd1f54bf41a3485c564dfb50f490c5 (diff) | |
| parent | 444a7c3bb897ec6a64b83d277102440c1dcc22a1 (diff) | |
Merge branch 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
* 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: Use a proper timeout mechanism
ARM: mx28: check for gated clocks when setting saif divider
arm/mxs: Add support for SSP/MMC ports 2 & 3
Diffstat (limited to 'arch/arm/mach-mxs/include')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index e1237ab25862..c50c3ea28a9d 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h @@ -31,4 +31,6 @@ extern void mx28_init_irq(void); extern void icoll_init_irq(void); +extern int mxs_clkctrl_timeout(unsigned int reg_offset, unsigned int mask); + #endif /* __MACH_MXS_COMMON_H__ */ |