diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-05-01 21:52:26 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-05-02 15:54:05 -0400 |
| commit | f8eafb5f1a7af1281fef93fd47c9bfe0d68c8652 (patch) | |
| tree | 4098089ab14df7b5a4112457586a636aec9fbf08 /arch | |
| parent | dd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9 (diff) | |
alpha: properly define get/set_rtc_time on Marvel/SMP
The marvel_get_rtc_time and marvel_set_rtc_time are static, but they're
available through Marvel's machine vector.
Reported-by: Raúl Porcel <armin76@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/include/asm/rtc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h index 1f7fba671ae6..d70408d36677 100644 --- a/arch/alpha/include/asm/rtc.h +++ b/arch/alpha/include/asm/rtc.h | |||
| @@ -1,14 +1,10 @@ | |||
| 1 | #ifndef _ALPHA_RTC_H | 1 | #ifndef _ALPHA_RTC_H |
| 2 | #define _ALPHA_RTC_H | 2 | #define _ALPHA_RTC_H |
| 3 | 3 | ||
| 4 | #if defined(CONFIG_ALPHA_GENERIC) | 4 | #if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \ |
| 5 | || defined(CONFIG_ALPHA_GENERIC) | ||
| 5 | # define get_rtc_time alpha_mv.rtc_get_time | 6 | # define get_rtc_time alpha_mv.rtc_get_time |
| 6 | # define set_rtc_time alpha_mv.rtc_set_time | 7 | # define set_rtc_time alpha_mv.rtc_set_time |
| 7 | #else | ||
| 8 | # if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) | ||
| 9 | # define get_rtc_time marvel_get_rtc_time | ||
| 10 | # define set_rtc_time marvel_set_rtc_time | ||
| 11 | # endif | ||
| 12 | #endif | 8 | #endif |
| 13 | 9 | ||
| 14 | #include <asm-generic/rtc.h> | 10 | #include <asm-generic/rtc.h> |