diff --git a/[refs] b/[refs] index 788f0e83173e..d092f091d51b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f40f31bfe104d50d4fceb760ec48d2effd0610aa +refs/heads/master: aec8148fda5686b671fbbd9ffd6f432a1f80ee3c diff --git a/trunk/arch/x86_64/kernel/hpet.c b/trunk/arch/x86_64/kernel/hpet.c index 6b460402d504..636f4f9fc6bb 100644 --- a/trunk/arch/x86_64/kernel/hpet.c +++ b/trunk/arch/x86_64/kernel/hpet.c @@ -439,7 +439,7 @@ int hpet_rtc_dropped_irq(void) return 1; } -irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs) +irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) { struct rtc_time curr_time; unsigned long rtc_int_flag = 0;