Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into omap-for-v3.8/fixes-for-merge-window

Browse source

Pull timer fixes from Jon Hunter <jon-hunter@ti.com>:

Fixes for a few timer warnings observed with different kernel
configurations for OMAP2+ devices.

I have dropped the patch to fix a build error for OMAP4 in the
timer code as Olof already has this fix merged.

...

This commit is contained in:

Tony Lindgren 2012-12-14 09:10:23 -08:00

parent 698d601224 bf85f205d9

commit bce9e90fc6

2 changed files with 5 additions and 4 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

3

arch/arm/mach-omap2/Kconfig

View file

6

arch/arm/mach-omap2/timer.c

View file