diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-11 02:46:06 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-11 02:46:06 -0400 |
commit | 030caf3f22395d564ee8a4f056a9cb7190a7eed4 (patch) | |
tree | e421b64e36c35013fc6a15e006438ae67573403b /arch/arm/plat-omap/include | |
parent | e2e9bbeec90cb5a23cef153b54ec4307255f4e09 (diff) | |
parent | 1fe97c8f6a1de67a5f56e029a818903d5bed8017 (diff) |
Merge tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
Timer changes to make it easier to support various SoCs
By Vaibhav Hiremath
via Tony Lindgren
* tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: Make OMAP clocksource source selection using kernel param
ARM: OMAP2+: Replace space with underscore in the name field of system timers
ARM: OMAP1: Add checks for possible error condition in timer_init
Diffstat (limited to 'arch/arm/plat-omap/include')
-rw-r--r-- | arch/arm/plat-omap/include/plat/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index b4d7ec3fbfb..55c514be382 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <plat/i2c.h> | 30 | #include <plat/i2c.h> |
31 | #include <plat/omap_hwmod.h> | 31 | #include <plat/omap_hwmod.h> |
32 | 32 | ||
33 | extern int __init omap_init_clocksource_32k(void); | 33 | extern int __init omap_init_clocksource_32k(void __iomem *vbase); |
34 | 34 | ||
35 | extern void omap_reserve(void); | 35 | extern void omap_reserve(void); |
36 | extern int omap_dss_reset(struct omap_hwmod *); | 36 | extern int omap_dss_reset(struct omap_hwmod *); |