Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

[firefly-linux-kernel-4.4.55.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 b93af3ebb5baa1ece794b9054ca0fbf84563f20e..dcd39fba6ddd1c61a69aa99c7ad4e9f6285252fa 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;
-#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;