Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / arm / plat-omap / include / plat / omap_hwmod.h

diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 35675b2160748d9e2f483616c64a6304db7a10d0..30f55eb8b0bc6b2bfaf908204a39ad2437bc7605 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -646,7 +646,7 @@ int omap_hwmod_no_setup_reset(struct omap_hwmod *oh);
 
 int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx);
 
-const char *omap_hwmod_get_main_clk(struct omap_hwmod *oh);
+extern void __init omap_hwmod_init(void);
 
 /*
  * Chip variant-specific hwmod init routines - XXX should be converted