projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ecc46cf) | patch
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
authorTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 07:58:43 +0000 (00:58 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 07:58:43 +0000 (00:58 -0700)
commit68c9a95e9253ce1776bd21bf8d37ddf213cced66
tree286f516466c6c4ceaa404dfb97edbd4a393451f9tree | snapshot
parentecc46cfdad7499a21296f0757059c4965f1fbc98commit | 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>
arch/arm/mach-omap2/omap_hwmod.c diff | blob | history
arch/arm/plat-omap/include/plat/omap_hwmod.h diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git