diff options
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 72ba1a70f35f..e9e0934380b8 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -264,8 +264,6 @@ static int sh_rtc_proc(struct device *dev, struct seq_file *seq) | |||
| 264 | unsigned int tmp; | 264 | unsigned int tmp; | 
| 265 | 265 | ||
| 266 | tmp = readb(rtc->regbase + RCR1); | 266 | tmp = readb(rtc->regbase + RCR1); | 
| 267 | seq_printf(seq, "alarm_IRQ\t: %s\n", | ||
| 268 | (tmp & RCR1_AIE) ? "yes" : "no"); | ||
| 269 | seq_printf(seq, "carry_IRQ\t: %s\n", | 267 | seq_printf(seq, "carry_IRQ\t: %s\n", | 
| 270 | (tmp & RCR1_CIE) ? "yes" : "no"); | 268 | (tmp & RCR1_CIE) ? "yes" : "no"); | 
| 271 | 269 | ||
| @@ -428,6 +426,8 @@ static int sh_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) | |||
| 428 | tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */ | 426 | tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */ | 
| 429 | tm->tm_year = 0xffff; | 427 | tm->tm_year = 0xffff; | 
| 430 | 428 | ||
| 429 | wkalrm->enabled = (readb(rtc->regbase + RCR1) & RCR1_AIE) ? 1 : 0; | ||
| 430 | |||
| 431 | spin_unlock_irq(&rtc->lock); | 431 | spin_unlock_irq(&rtc->lock); | 
| 432 | 432 | ||
| 433 | return 0; | 433 | return 0; | 
