diff --git a/[refs] b/[refs] index d44b68629c1f..d67731f3002e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c54fdbb2823d96b842d00c548e14dbc0dd37831d +refs/heads/master: 5caf4636259ae3af0efbb9bfc4cd97874b547c7d diff --git a/trunk/include/linux/clocksource.h b/trunk/include/linux/clocksource.h index 27cfda427dd9..aa7032c7238f 100644 --- a/trunk/include/linux/clocksource.h +++ b/trunk/include/linux/clocksource.h @@ -206,6 +206,7 @@ struct clocksource { #define CLOCK_SOURCE_WATCHDOG 0x10 #define CLOCK_SOURCE_VALID_FOR_HRES 0x20 #define CLOCK_SOURCE_UNSTABLE 0x40 +#define CLOCK_SOURCE_SUSPEND_NONSTOP 0x80 /* simplify initialization of mask field */ #define CLOCKSOURCE_MASK(bits) (cycle_t)((bits) < 64 ? ((1ULL<<(bits))-1) : -1)