diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-03 09:35:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-03 09:35:04 +1000 |
| commit | ebec44a2456fbe5fe18aae88f6010f6878f0cb4a (patch) | |
| tree | 427734722bdf3e807333329f33a6dbd6e95ec747 /drivers/clocksource/numachip.c | |
| parent | 659333de48268550b5f09fcd45f76459d737b946 (diff) | |
| parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) | |
| download | talos-op-linux-ebec44a2456fbe5fe18aae88f6010f6878f0cb4a.tar.gz talos-op-linux-ebec44a2456fbe5fe18aae88f6010f6878f0cb4a.zip | |
BackMerge tag 'v4.14-rc3' into drm-next
Linux 4.14-rc3
Requested by Daniel for the tracing build fix in fixes.
Diffstat (limited to 'drivers/clocksource/numachip.c')
| -rw-r--r-- | drivers/clocksource/numachip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/numachip.c b/drivers/clocksource/numachip.c index 6a20dc8b253f..9a7d7f0f23fe 100644 --- a/drivers/clocksource/numachip.c +++ b/drivers/clocksource/numachip.c @@ -43,7 +43,7 @@ static int numachip2_set_next_event(unsigned long delta, struct clock_event_devi return 0; } -static struct clock_event_device numachip2_clockevent = { +static const struct clock_event_device numachip2_clockevent __initconst = { .name = "numachip2", .rating = 400, .set_next_event = numachip2_set_next_event, |
