git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
pps
/
generators
/
pps_gen_parport.c
diff --git
a/drivers/pps/generators/pps_gen_parport.c
b/drivers/pps/generators/pps_gen_parport.c
index
b93af3e
..
dcd39fb
100644
(file)
--- a/
drivers/pps/generators/pps_gen_parport.c
+++ b/
drivers/pps/generators/pps_gen_parport.c
@@
-216,11
+216,6
@@
static void parport_attach(struct parport *port)
hrtimer_init(&device.timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);
device.timer.function = hrtimer_event;
hrtimer_init(&device.timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);
device.timer.function = hrtimer_event;
-#ifdef CONFIG_PREEMPT_RT
- /* hrtimer interrupt will run in the interrupt context with this */
- device.timer.irqsafe = 1;
-#endif
-
hrtimer_start(&device.timer, next_intr_time(&device), HRTIMER_MODE_ABS);
return;
hrtimer_start(&device.timer, next_intr_time(&device), HRTIMER_MODE_ABS);
return;