ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API

Browse source

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>

...

This commit is contained in:

Tony Lindgren 2012-07-06 00:58:43 -07:00

parent ecc46cfdad

commit 68c9a95e92

2 changed files with 17 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

arch/arm/mach-omap2/omap_hwmod.c

View file

2

arch/arm/plat-omap/include/plat/omap_hwmod.h

View file