diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /arch/alpha/include/asm/rtc.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/include/asm/rtc.h')
| -rw-r--r-- | arch/alpha/include/asm/rtc.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h index d70408d36677..f71c3b0ed360 100644 --- a/arch/alpha/include/asm/rtc.h +++ b/arch/alpha/include/asm/rtc.h | |||
| @@ -1,12 +1 @@ | |||
| 1 | #ifndef _ALPHA_RTC_H | ||
| 2 | #define _ALPHA_RTC_H | ||
| 3 | |||
| 4 | #if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \ | ||
| 5 | || defined(CONFIG_ALPHA_GENERIC) | ||
| 6 | # define get_rtc_time alpha_mv.rtc_get_time | ||
| 7 | # define set_rtc_time alpha_mv.rtc_set_time | ||
| 8 | #endif | ||
| 9 | |||
| 10 | #include <asm-generic/rtc.h> | #include <asm-generic/rtc.h> | |
| 11 | |||
| 12 | #endif | ||