TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alarmtimer: Fix conflicting definitions of alarmtimer_get_rtcdev

Browse Source 
Both the implementation in kernel/time/alarmtime.c have same definition.

This fixes following compile-time error.

kernel/time/alarmtimer.c:113:46: error: macro "alarmtimer_get_rtcdev" passed 1 arguments, but takes just 0
kernel/time/alarmtimer.c:114:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
make[2]: *** [kernel/time/alarmtimer.o] Error 1

Change-Id: Ib5eb4b3fb0cd5077d19cc4d91e823aa253779b4d
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
This commit is contained in:
Tushar Behera
2012-03-26 17:00:24 +05:30
committed by Colin Cross
parent e9a85c71af
commit 266328fd18
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/alarmtimer.h
View File

@@ -77,10 +77,6 @@ static inline int alarmtimer_callback_running(struct alarm *timer)
/* Provide way to access the rtc device being used by alarmtimers */ /* Provide way to access the rtc device being used by alarmtimers */
#ifdef CONFIG_RTC_CLASS
struct rtc_device *alarmtimer_get_rtcdev(void); struct rtc_device *alarmtimer_get_rtcdev(void);
#else
#define alarmtimer_get_rtcdev() (0)
#endif
#endif #endif