projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[cascardo/linux.git]
/
drivers
/
clocksource
/
timer-imx-gpt.c
diff --git
a/drivers/clocksource/timer-imx-gpt.c
b/drivers/clocksource/timer-imx-gpt.c
index
2d59038
..
86c7eb6
100644
(file)
--- 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);
}