diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 16:08:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 16:08:20 -0400 |
| commit | d84c4124c4b6611301b402e8611b7e36de3bd351 (patch) | |
| tree | d83cfaabfb901755d85074815ad948028dc7b03f /drivers | |
| parent | 932c37c375cca25175f9b6acee4c75d7a96d985f (diff) | |
| parent | a3cf4ea8729a5d448742fd5a0a003827c9f25cb6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix stacktrace simplification fallout.
sh: SH7760 DMABRG support.
sh: clockevent/clocksource/hrtimers/nohz TMU support.
sh: Truncate MAX_ACTIVE_REGIONS for the common case.
rtc: rtc-sh: Fix rtc_dev pointer for rtc_update_irq().
sh: Convert to common die chain.
sh: Wire up utimensat syscall.
sh: landisk mv_nr_irqs definition.
sh: Fixup ndelay() xloops calculation for alternate HZ.
sh: Add 32-bit opcode feature CPU flag.
sh: Fix PC adjustments for varying opcode length.
sh: Support for SH-2A 32-bit opcodes.
sh: Kill off redundant __div64_32 symbol export.
sh: Share exception vector table for SH-3/4.
sh: Always define TRAPA_BUG_OPCODE.
sh: __GFP_REPEAT for pte allocations, too.
rtc: rtc-sh: Fix up dev_dbg() warnings.
sh: generic quicklist support.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 6abf4811958c..e0f91dfce0f5 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -104,7 +104,7 @@ static irqreturn_t sh_rtc_interrupt(int irq, void *dev_id) | |||
| 104 | 104 | ||
| 105 | writeb(tmp, rtc->regbase + RCR1); | 105 | writeb(tmp, rtc->regbase + RCR1); |
| 106 | 106 | ||
| 107 | rtc_update_irq(&rtc->rtc_dev, 1, events); | 107 | rtc_update_irq(rtc->rtc_dev, 1, events); |
| 108 | 108 | ||
| 109 | spin_unlock(&rtc->lock); | 109 | spin_unlock(&rtc->lock); |
| 110 | 110 | ||
| @@ -139,7 +139,7 @@ static irqreturn_t sh_rtc_alarm(int irq, void *dev_id) | |||
| 139 | 139 | ||
| 140 | rtc->rearm_aie = 1; | 140 | rtc->rearm_aie = 1; |
| 141 | 141 | ||
| 142 | rtc_update_irq(&rtc->rtc_dev, 1, events); | 142 | rtc_update_irq(rtc->rtc_dev, 1, events); |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | spin_unlock(&rtc->lock); | 145 | spin_unlock(&rtc->lock); |
| @@ -153,7 +153,7 @@ static irqreturn_t sh_rtc_periodic(int irq, void *dev_id) | |||
| 153 | 153 | ||
| 154 | spin_lock(&rtc->lock); | 154 | spin_lock(&rtc->lock); |
| 155 | 155 | ||
| 156 | rtc_update_irq(&rtc->rtc_dev, 1, RTC_PF | RTC_IRQF); | 156 | rtc_update_irq(rtc->rtc_dev, 1, RTC_PF | RTC_IRQF); |
| 157 | 157 | ||
| 158 | spin_unlock(&rtc->lock); | 158 | spin_unlock(&rtc->lock); |
| 159 | 159 | ||
| @@ -341,7 +341,7 @@ static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
| 341 | tm->tm_sec--; | 341 | tm->tm_sec--; |
| 342 | #endif | 342 | #endif |
| 343 | 343 | ||
| 344 | dev_dbg(&dev, "%s: tm is secs=%d, mins=%d, hours=%d, " | 344 | dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, " |
| 345 | "mday=%d, mon=%d, year=%d, wday=%d\n", | 345 | "mday=%d, mon=%d, year=%d, wday=%d\n", |
| 346 | __FUNCTION__, | 346 | __FUNCTION__, |
| 347 | tm->tm_sec, tm->tm_min, tm->tm_hour, | 347 | tm->tm_sec, tm->tm_min, tm->tm_hour, |