Merge from master

This commit is contained in:
Gregory Nutt 2014-06-23 11:10:24 -06:00
commit dbcbbf1adf
3 changed files with 5 additions and 2 deletions

View file

@ -99,7 +99,7 @@
* system time-of-day clock.
*/
#ifdef CLOCK_MONOTONIC
#ifdef CONFIG_CLOCK_MONOTONIC
# define CLOCK_MONOTONIC 2
#endif