git.samba.org
/
sfrench
/
cifs-2.6.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/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
timer.c
diff --git
a/arch/arm/mach-omap1/timer.c
b/arch/arm/mach-omap1/timer.c
index aa81593db1af9f054058f2c1ed87d295e15bbafd..cdeb9d3ef64096f7ca3a2082ccb6c72038dce995 100644
(file)
--- a/
arch/arm/mach-omap1/timer.c
+++ b/
arch/arm/mach-omap1/timer.c
@@
-141,7
+141,7
@@
static int __init omap1_dm_timer_init(void)
pdata->set_timer_src = omap1_dm_timer_set_src;
pdata->timer_capability = OMAP_TIMER_ALWON |
- OMAP_TIMER_NEEDS_RESET;
+ OMAP_TIMER_NEEDS_RESET
| OMAP_TIMER_HAS_DSP_IRQ
;
ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (ret) {