diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 15:03:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 15:03:45 -0800 |
| commit | d5bdaf4f68f0590fc481bca54bcaffeb27b75fca (patch) | |
| tree | a3c02e146c8c3b33e77e212f15d4851b6febd26b /arch/alpha/include/asm/rtc.h | |
| parent | dc6ec87d4c77029457a79fd6fa9b6f8304dc8348 (diff) | |
| parent | 5cfe8f1ba5eebe6f4b6e5858cdb1a5be4f3272a6 (diff) | |
| download | linux-d5bdaf4f68f0590fc481bca54bcaffeb27b75fca.tar.gz linux-d5bdaf4f68f0590fc481bca54bcaffeb27b75fca.tar.bz2 linux-d5bdaf4f68f0590fc481bca54bcaffeb27b75fca.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha updates from Matt Turner:
"It contains a few fixes and some work from Richard to make alpha
emulation under QEMU much more usable"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: Prevent a NULL ptr dereference in csum_partial_copy.
alpha: perf: fix out-of-bounds array access triggered from raw event
alpha: Use qemu+cserve provided high-res clock and alarm.
alpha: Switch to GENERIC_CLOCKEVENTS
alpha: Enable the rpcc clocksource for single processor
alpha: Reorganize rtc handling
alpha: Primitive support for CPU power down.
alpha: Allow HZ to be configured
alpha: Notice if we're being run under QEMU
alpha: Eliminate compiler warning from memset macro
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 @@ -#ifndef _ALPHA_RTC_H -#define _ALPHA_RTC_H - -#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 -#endif - #include <asm-generic/rtc.h> - -#endif |