]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e422968) | 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)
commit7b1a051a9d86050f7f5c5b3682287d9fe7734530
tree286f516466c6c4ceaa404dfb97edbd4a393451f9tree | snapshot
parente422968e04a19ccd8d018193e1885260d18ad5dfcommit | diff
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API

Commit cd2e2d848 (Merge tag 'omap-devel-f-for-3.6'...) had a merge
conflict that somehow got incorrecly resolved in a lossy way for
commit 99095f1f (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
Linux Kernel Source Tree.