diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
| commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
| tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /arch/alpha/kernel/machvec_impl.h | |
| parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/alpha/kernel/machvec_impl.h')
| -rw-r--r-- | arch/alpha/kernel/machvec_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h index 4959b7a3e1e6..11f996f24fde 100644 --- a/arch/alpha/kernel/machvec_impl.h +++ b/arch/alpha/kernel/machvec_impl.h | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #define CAT1(x,y) x##y | 41 | #define CAT1(x,y) x##y |
| 42 | #define CAT(x,y) CAT1(x,y) | 42 | #define CAT(x,y) CAT1(x,y) |
| 43 | 43 | ||
| 44 | #define DO_DEFAULT_RTC rtc_port: 0x70 | 44 | #define DO_DEFAULT_RTC .rtc_port = 0x70 |
| 45 | 45 | ||
| 46 | #define DO_EV4_MMU \ | 46 | #define DO_EV4_MMU \ |
| 47 | .max_asn = EV4_MAX_ASN, \ | 47 | .max_asn = EV4_MAX_ASN, \ |