diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /include/asm-x86/mca.h | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'include/asm-x86/mca.h')
| -rw-r--r-- | include/asm-x86/mca.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mca.h b/include/asm-x86/mca.h index 09adf2eac4dc..60d1ed287b13 100644 --- a/include/asm-x86/mca.h +++ b/include/asm-x86/mca.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* -*- mode: c; c-basic-offset: 8 -*- */ | 1 | /* -*- mode: c; c-basic-offset: 8 -*- */ |
| 2 | 2 | ||
| 3 | /* Platform specific MCA defines */ | 3 | /* Platform specific MCA defines */ |
| 4 | #ifndef _ASM_MCA_H | 4 | #ifndef ASM_X86__MCA_H |
| 5 | #define _ASM_MCA_H | 5 | #define ASM_X86__MCA_H |
| 6 | 6 | ||
| 7 | /* Maximal number of MCA slots - actually, some machines have less, but | 7 | /* Maximal number of MCA slots - actually, some machines have less, but |
| 8 | * they all have sufficient number of POS registers to cover 8. | 8 | * they all have sufficient number of POS registers to cover 8. |
| @@ -40,4 +40,4 @@ | |||
| 40 | */ | 40 | */ |
| 41 | #define MCA_NUMADAPTERS (MCA_MAX_SLOT_NR+3) | 41 | #define MCA_NUMADAPTERS (MCA_MAX_SLOT_NR+3) |
| 42 | 42 | ||
| 43 | #endif | 43 | #endif /* ASM_X86__MCA_H */ |