diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 15:11:31 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 15:11:31 -0400 |
| commit | 4bcbfff618f92f770dff28c8d3320fc96acf52df (patch) | |
| tree | 2d8d8d1cf804d0b60a43e47a43b9b72570b436dd /drivers/rtc/interface.c | |
| parent | 1c3cc11602111d1318c2a5743bd2e88c82813927 (diff) | |
| parent | d576fe49ca5c238e99d2d010a410480cb2aa29a0 (diff) | |
Merge branch 'fortglx/3.0/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Diffstat (limited to 'drivers/rtc/interface.c')
| -rw-r--r-- | drivers/rtc/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index ef6316acec43..df68618f6dbb 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c | |||
| @@ -318,7 +318,7 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) | |||
| 318 | } | 318 | } |
| 319 | EXPORT_SYMBOL_GPL(rtc_read_alarm); | 319 | EXPORT_SYMBOL_GPL(rtc_read_alarm); |
| 320 | 320 | ||
| 321 | int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) | 321 | static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) |
| 322 | { | 322 | { |
| 323 | struct rtc_time tm; | 323 | struct rtc_time tm; |
| 324 | long now, scheduled; | 324 | long now, scheduled; |