From: Tony Lindgren <tony@atomide.com>
Date: Fri, 6 Jul 2012 07:58:43 +0000 (-0700)
Subject: ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
X-Git-Tag: omap-cleanup-part2-for-v3.6~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c9a95e9253ce1776bd21bf8d37ddf213cced66;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed