diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-05-02 03:52:26 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-05-02 21:54:05 +0200 |
| commit | f8eafb5f1a7af1281fef93fd47c9bfe0d68c8652 (patch) | |
| tree | 4098089ab14df7b5a4112457586a636aec9fbf08 /arch/alpha | |
| parent | alpha: VGA_HOSE depends on VGA_CONSOLE (diff) | |
| download | linux-f8eafb5f1a7af1281fef93fd47c9bfe0d68c8652.tar.xz linux-f8eafb5f1a7af1281fef93fd47c9bfe0d68c8652.zip | |
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/alpha')
| -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 @@ #ifndef _ALPHA_RTC_H #define _ALPHA_RTC_H -#if defined(CONFIG_ALPHA_GENERIC) +#if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \ + || defined(CONFIG_ALPHA_GENERIC) # define get_rtc_time alpha_mv.rtc_get_time # define set_rtc_time alpha_mv.rtc_set_time -#else -# if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) -# define get_rtc_time marvel_get_rtc_time -# define set_rtc_time marvel_set_rtc_time -# endif #endif #include <asm-generic/rtc.h> |