diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
| commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
| tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /arch/arm/common/rtctime.c | |
| parent | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/arm/common/rtctime.c')
| -rw-r--r-- | arch/arm/common/rtctime.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c index 35c9a64ac14c..4e5445cfb0ea 100644 --- a/arch/arm/common/rtctime.c +++ b/arch/arm/common/rtctime.c | |||
| @@ -68,6 +68,7 @@ void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc | |||
| 68 | rtc_time_to_tm(next_time, next); | 68 | rtc_time_to_tm(next_time, next); |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | EXPORT_SYMBOL(rtc_next_alarm_time); | ||
| 71 | 72 | ||
| 72 | static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm) | 73 | static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm) |
| 73 | { | 74 | { |