diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-24 16:36:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-24 16:36:42 +1000 |
| commit | 3732ce72b45a2a145803558758821bf198751276 (patch) | |
| tree | 75047ed1f43cfd56231535c401924dbb27c4d0f0 /drivers/clocksource/timer-imx-gpt.c | |
| parent | e829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff) | |
| parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8
Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'drivers/clocksource/timer-imx-gpt.c')
| -rw-r--r-- | drivers/clocksource/timer-imx-gpt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 2d59038dec43..86c7eb66bdfb 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -462,6 +462,7 @@ void __init mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type) BUG_ON(!imxtm->base); imxtm->type = type; + imxtm->irq = irq; _mxc_timer_init(imxtm); } |