Merge branch 'clockevents/fixes' of git://git.linaro.org/people/dlezcano/linux into timers/urgent

Browse source

* Hide event stream Kconfig option for the arch_arm_timer for ARM=n
 * Fix a missing a clk_put in case the registering of the sh_mtu[2] drivers fails.
 * Reuse clockevents_config_and_register for the at91rm9200_time timer

...

This commit is contained in:

Thomas Gleixner 2013-11-26 19:00:32 +01:00

parent 4be77398ac 77f7ce9a9f

commit 70fe8217e1

4 changed files with 34 additions and 10 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

7

arch/arm/mach-at91/at91rm9200_time.c

View file

1

drivers/clocksource/Kconfig

View file

16

drivers/clocksource/sh_mtu2.c

View file

20

drivers/clocksource/sh_tmu.c

View file