ARM: imx: fix mismerge of localtimer code

Browse source

I mis-resolved a merge conflict due to the branch being a bit on the old side,
Stephen noticed. Here's the fix.

Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2013-08-02 13:47:12 -07:00

parent 18060f3541

commit 087bd3d492

1 changed files with 0 additions and 1 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

1

arch/arm/mach-imx/Kconfig

View file