diff --git a/[refs] b/[refs] index 559498439349..14ce4864394f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92a3d03aab912624cae799e5772a6eb2ef55083f +refs/heads/master: 533ffc289db9f44c0633d3a7b87243b5740b02b2 diff --git a/trunk/drivers/char/rtc.c b/trunk/drivers/char/rtc.c index e1d70e8b6268..664f36c98e6a 100644 --- a/trunk/drivers/char/rtc.c +++ b/trunk/drivers/char/rtc.c @@ -113,7 +113,12 @@ 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 -static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {return 0;} +#ifdef RTC_IRQ +static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) +{ + return 0; +} +#endif #else extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id); #endif