Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304398
b: refs/heads/master
c: 57c498f
h: refs/heads/master
v: v3
  • Loading branch information
John Stultz authored and Greg Kroah-Hartman committed Apr 20, 2012
1 parent db6d584 commit d02a5b5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2d8ccef0a8e8aedaf401edca6ad54663b0da24b
refs/heads/master: 57c498fa5df05e4bd410c101795368439fec7b4e
3 changes: 3 additions & 0 deletions trunk/include/linux/alarmtimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,7 @@ static inline int alarmtimer_callback_running(struct alarm *timer)
}


/* Provide way to access the rtc device being used by alarmtimers */
struct rtc_device *alarmtimer_get_rtcdev(void);

#endif
4 changes: 2 additions & 2 deletions trunk/kernel/time/alarmtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static DEFINE_SPINLOCK(rtcdev_lock);
* If one has not already been chosen, it checks to see if a
* functional rtc device is available.
*/
static struct rtc_device *alarmtimer_get_rtcdev(void)
struct rtc_device *alarmtimer_get_rtcdev(void)
{
unsigned long flags;
struct rtc_device *ret;
Expand Down Expand Up @@ -115,7 +115,7 @@ static void alarmtimer_rtc_interface_remove(void)
class_interface_unregister(&alarmtimer_rtc_interface);
}
#else
static inline struct rtc_device *alarmtimer_get_rtcdev(void)
struct rtc_device *alarmtimer_get_rtcdev(void)
{
return NULL;
}
Expand Down

0 comments on commit d02a5b5

Please sign in to comment.