- Fix harmless warning with the ixp4xx when the TIMER_OF option is not selected (Arnd Bergmann)

- Make sure channel clock supply is enabled on sh_cmt (Geert Uytterhoeven)
 
 - Fix compilation error when DEBUG is defined with the mxs_timer (Tom Rix)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEGn3N4YVz0WNVyHskqDIjiipP6E8FAmAHLXsACgkQqDIjiipP
 6E8rJgf8C0/765D8R3JigvoRc09vMXBCSYaFbZcSvhcM0EhbTvQySa1Stqk0Rq1H
 jtkXr7X6IX4ricpTteQt35f6cgJkdlnp0sqKYsVTQi/UaFDonFOtEdiDn2mV0eDt
 Ejq9aq6PtsDAk1gIyjNg6IGBVnEigDq7E3Na+v7BFYQ5o310aTZ7z5jA2UuhtAMK
 IJv0+P0doTY29F4x9Hy0NZK4s6sI9BZO6b3xyYkCioArYjfnUBx9nth1Gg38DxQU
 HjAnPa27icevRLVNWU/hzn2CO0FYKm+ZspfYk/RGO1uSFO8aber4ES1KXGrPrjuH
 Rea2E4qqTOjfT2gvXgg8mdxY+c8n7A==
 =h++q
 -----END PGP SIGNATURE-----

Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clockevent fixes from Daniel Lezcano

 - Fix harmless warning with the ixp4xx when the TIMER_OF option is not
   selected (Arnd Bergmann)

 - Make sure channel clock supply is enabled on sh_cmt (Geert Uytterhoeven)

 - Fix compilation error when DEBUG is defined with the mxs_timer (Tom Rix)

Link: https://lore.kernel.org/r/ae3bcda6-5180-639d-6246-d2dfd271c3e7@linaro.org
This commit is contained in:
Thomas Gleixner 2021-02-22 10:59:13 +01:00
commit 8acb54abc1
4 changed files with 15 additions and 8 deletions