diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-03-26 17:00:24 +0530 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-04-20 00:05:50 +0400 |
| commit | 1828abfc1c46dd6b03430048ab50318c7bc3fb53 (patch) | |
| tree | f667b3ac687d165e2fc2ba2d52853345df15ead8 | |
| parent | 6832120be219b056fef388ce3efc65bf28e1619c (diff) | |
| download | linux-topics-1828abfc1c46dd6b03430048ab50318c7bc3fb53.tar.gz | |
alarmtimer: Fix conflicting definitions of alarmtimer_get_rtcdevlinux-linaro-3.4-rc3-2012.04-0linux-linaro-20120419
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 efbf6788c9e..96c5c249b08 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 |