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/kernel/machvec_impl.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/kernel/machvec_impl.h')
| -rw-r--r-- | arch/alpha/kernel/machvec_impl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h index 7fa62488bd16..f54bdf658cd0 100644 --- a/arch/alpha/kernel/machvec_impl.h +++ b/arch/alpha/kernel/machvec_impl.h | |||
| @@ -43,10 +43,7 @@ | |||
| 43 | #define CAT1(x,y) x##y | 43 | #define CAT1(x,y) x##y |
| 44 | #define CAT(x,y) CAT1(x,y) | 44 | #define CAT(x,y) CAT1(x,y) |
| 45 | 45 | ||
| 46 | #define DO_DEFAULT_RTC \ | 46 | #define DO_DEFAULT_RTC .rtc_port = 0x70 |
| 47 | .rtc_port = 0x70, \ | ||
| 48 | .rtc_get_time = common_get_rtc_time, \ | ||
| 49 | .rtc_set_time = common_set_rtc_time | ||
| 50 | 47 | ||
| 51 | #define DO_EV4_MMU \ | 48 | #define DO_EV4_MMU \ |
| 52 | .max_asn = EV4_MAX_ASN, \ | 49 | .max_asn = EV4_MAX_ASN, \ |