diff options
author | Tony Lindgren <tony@atomide.com> | 2012-07-06 03:58:43 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-07-06 03:58:43 -0400 |
commit | 68c9a95e9253ce1776bd21bf8d37ddf213cced66 (patch) | |
tree | 286f516466c6c4ceaa404dfb97edbd4a393451f9 /arch/arm/plat-omap/include/plat/omap_hwmod.h | |
parent | ecc46cfdad7499a21296f0757059c4965f1fbc98 (diff) |
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
Commit ac5b0ea3d (Merge tag 'omap-devel-f-for-3.6'...) had a merge
conflict that somehow got incorrecly resolved in a lossy way for
commit bed9d1bb (ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API).
Fix the issue by applying the missing pieces.
Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap_hwmod.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 30f55eb8b0bc..6132972aff37 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h | |||
@@ -648,6 +648,8 @@ int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx); | |||
648 | 648 | ||
649 | extern void __init omap_hwmod_init(void); | 649 | extern void __init omap_hwmod_init(void); |
650 | 650 | ||
651 | const char *omap_hwmod_get_main_clk(struct omap_hwmod *oh); | ||
652 | |||
651 | /* | 653 | /* |
652 | * Chip variant-specific hwmod init routines - XXX should be converted | 654 | * Chip variant-specific hwmod init routines - XXX should be converted |
653 | * to use initcalls once the initial boot ordering is straightened out | 655 | * to use initcalls once the initial boot ordering is straightened out |