diff options
| author | Sangwook Lee <sangwook.lee@linaro.org> | 2012-04-04 16:02:13 +0100 |
|---|---|---|
| committer | Sangwook Lee <sangwook.lee@linaro.org> | 2012-04-04 18:41:30 +0100 |
| commit | bec923ef2b7c9653524c93764c42be5d2db04b65 (patch) | |
| tree | 2b5adc3ee513c51abfbf1860f6291152751ff4a2 | |
| parent | 2d4035927a94fe74de5c7ee3f891b89da7b05294 (diff) | |
alarmtimer: fix compile errorsamsung-lt-android-v3.3-1
Fix compile errors:
kernel/time/alarmtimer.c:62:27:
error: static declaration of ‘alarmtimer_get_rtcdev’ follows non-static declaration
include/linux/alarmtimer.h:81:20:
note: previous declaration of ‘alarmtimer_get_rtcdev’ was here
kernel/time/alarmtimer.c:113:60:
error: macro "alarmtimer_get_rtcdev" passed 1 arguments, but takes just 0
Signed-off-by: Sangwook Lee <sangwook.lee@linaro.org>
| -rw-r--r-- | include/linux/alarmtimer.h | 1 | ||||
| -rw-r--r-- | kernel/time/alarmtimer.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h index efbf6788c9e0..0407aecef966 100644 --- a/include/linux/alarmtimer.h +++ b/include/linux/alarmtimer.h @@ -78,7 +78,6 @@ static inline int alarmtimer_callback_running(struct alarm *timer) /* Provide way to access the rtc device being used by alarmtimers */ #ifdef CONFIG_RTC_CLASS -struct rtc_device *alarmtimer_get_rtcdev(void); #else #define alarmtimer_get_rtcdev() (0) #endif diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 76ae34e049d9..50d1bb049a88 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. */ -struct rtc_device *alarmtimer_get_rtcdev(void) +static struct rtc_device *alarmtimer_get_rtcdev(void) { unsigned long flags; struct rtc_device *ret; @@ -110,10 +110,6 @@ static void alarmtimer_rtc_interface_remove(void) class_interface_unregister(&alarmtimer_rtc_interface); } #else -struct rtc_device *alarmtimer_get_rtcdev(void) -{ - return NULL; -} #define rtcdev (NULL) static inline int alarmtimer_rtc_interface_setup(void) { return 0; } static inline void alarmtimer_rtc_interface_remove(void) { } |