diff options
| author | Tony Lindgren <[email protected]> | 2012-07-06 00:58:43 -0700 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2012-07-06 00:58:43 -0700 |
| commit | 68c9a95e9253ce1776bd21bf8d37ddf213cced66 (patch) | |
| tree | 286f516466c6c4ceaa404dfb97edbd4a393451f9 /net/lapb/lapb_timer.c | |
| parent | ecc46cfdad7499a21296f0757059c4965f1fbc98 (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 <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions