diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 20:48:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-02 20:48:07 +0200 |
| commit | d210267741fb2a8b6d741d9040703683a39087f4 (patch) | |
| tree | bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb /kernel | |
| parent | Linux 3.4-rc5 (diff) | |
| parent | Staging: comedi: fix line over 80 character issue in rtd520.c (diff) | |
| download | linux-d210267741fb2a8b6d741d9040703683a39087f4.tar.xz linux-d210267741fb2a8b6d741d9040703683a39087f4.zip | |
Merge 3.4-rc5 into staging-next
This resolves the conflict in:
drivers/staging/vt6656/ioctl.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/alarmtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 8a538c55fc7b..aa27d391bfc8 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -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; @@ -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; } |