diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-03-26 17:00:24 +0530 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-03-26 19:57:26 +0400 |
| commit | 0b7071f0561583d1fc4af4f282b99e5cccb1e571 (patch) | |
| tree | 3c2eeb15d7951c55715b2125aaaf5784e44464c6 | |
| parent | b3d755383884f9c9d1589baa513afb6507741d0e (diff) | |
alarmtimer: Fix conflicting definitions of alarmtimer_get_rtcdevlinux-linaro-3.3-2012.03-2
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
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | include/linux/alarmtimer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h index efbf6788c9e0..96c5c249b086 100644 --- a/include/linux/alarmtimer.h +++ b/include/linux/alarmtimer.h @@ -77,10 +77,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 #endif |