diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/asm-x86/mca.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
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 */ |