diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 21:11:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 21:11:31 +0200 |
| commit | 4bcbfff618f92f770dff28c8d3320fc96acf52df (patch) | |
| tree | 2d8d8d1cf804d0b60a43e47a43b9b72570b436dd /drivers/rtc/interface.c | |
| parent | timers: Consider slack value in mod_timer() (diff) | |
| parent | rtc: Staticize non-exported __rtc_set_alarm() (diff) | |
| download | wireguard-linux-4bcbfff618f92f770dff28c8d3320fc96acf52df.tar.xz wireguard-linux-4bcbfff618f92f770dff28c8d3320fc96acf52df.zip | |
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) } EXPORT_SYMBOL_GPL(rtc_read_alarm); -int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) +static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) { struct rtc_time tm; long now, scheduled; |