From d7112e353ca0f44ec3bbb40bf89a86aec82c9017 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 1 May 2012 21:52:26 -0400 Subject: [PATCH] --- yaml --- r: 300072 b: refs/heads/master c: f8eafb5f1a7af1281fef93fd47c9bfe0d68c8652 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/alpha/include/asm/rtc.h | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ba423f2b131d..496ef4f9469e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd7f1fe1fbe14cb100de14e6aa26ce4d3be0fab9 +refs/heads/master: f8eafb5f1a7af1281fef93fd47c9bfe0d68c8652 diff --git a/trunk/arch/alpha/include/asm/rtc.h b/trunk/arch/alpha/include/asm/rtc.h index 1f7fba671ae6..d70408d36677 100644 --- a/trunk/arch/alpha/include/asm/rtc.h +++ b/trunk/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