diff --git a/[refs] b/[refs] index f863e431538e..97c9616245a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b59931649256685f294d2d163a4f6d6286fbff05 +refs/heads/master: 32fa458688fa2e68bc433929b2d4941eef7efe39 diff --git a/trunk/drivers/char/rtc.c b/trunk/drivers/char/rtc.c index 78b151c4d20f..5c3142b6f1fc 100644 --- a/trunk/drivers/char/rtc.c +++ b/trunk/drivers/char/rtc.c @@ -110,8 +110,8 @@ static int rtc_has_irq = 1; #define hpet_set_rtc_irq_bit(arg) 0 #define hpet_rtc_timer_init() do { } while (0) #define hpet_rtc_dropped_irq() 0 -#define hpet_register_irq_handler(h) 0 -#define hpet_unregister_irq_handler(h) 0 +#define hpet_register_irq_handler(h) ({ 0; }) +#define hpet_unregister_irq_handler(h) ({ 0; }) #ifdef RTC_IRQ static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {