diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
| commit | fe47784ba5cbb6b713c013e046859946789b45e4 (patch) | |
| tree | 6384958d55e29be0d2eb8ae78fa437c10636d8d6 /arch/alpha/include/asm/rtc.h | |
| parent | 83b8e28b14d63db928cb39e5c5ed2a548246bd71 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/xsave
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/alpha/include/asm/rtc.h')
| -rw-r--r-- | arch/alpha/include/asm/rtc.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h new file mode 100644 index 000000000000..4e854b1333eb --- /dev/null +++ b/arch/alpha/include/asm/rtc.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | #ifndef _ALPHA_RTC_H | ||
| 2 | #define _ALPHA_RTC_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * Alpha uses the default access methods for the RTC. | ||
| 6 | */ | ||
| 7 | |||
| 8 | #include <asm-generic/rtc.h> | ||
| 9 | |||
| 10 | #endif | ||