diff --git a/[refs] b/[refs] index 06e40d2e7b49..046fc763f6e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d0640b47da74cff7c11642c798d40de861ed524 +refs/heads/master: 1daeddd5962acad1bea55e524fc0fadf32654a21 diff --git a/trunk/include/linux/rtc.h b/trunk/include/linux/rtc.h index 3c995b4d742c..ea760698e6fe 100644 --- a/trunk/include/linux/rtc.h +++ b/trunk/include/linux/rtc.h @@ -235,8 +235,6 @@ extern int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq); extern int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled); extern int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled); -extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc, - unsigned int enabled); void rtc_aie_update_irq(void *private); void rtc_uie_update_irq(void *private);