diff options
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/bootparam.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/setup.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 8e6218550e77..c8bfe63a06de 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h | |||
| @@ -124,6 +124,7 @@ enum { | |||
| 124 | X86_SUBARCH_LGUEST, | 124 | X86_SUBARCH_LGUEST, |
| 125 | X86_SUBARCH_XEN, | 125 | X86_SUBARCH_XEN, |
| 126 | X86_SUBARCH_MRST, | 126 | X86_SUBARCH_MRST, |
| 127 | X86_SUBARCH_CE4100, | ||
| 127 | X86_NR_SUBARCHS, | 128 | X86_NR_SUBARCHS, |
| 128 | }; | 129 | }; |
| 129 | 130 | ||
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index d6763b139a84..db8aa19a08a2 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
| @@ -53,6 +53,12 @@ extern void x86_mrst_early_setup(void); | |||
| 53 | static inline void x86_mrst_early_setup(void) { } | 53 | static inline void x86_mrst_early_setup(void) { } |
| 54 | #endif | 54 | #endif |
| 55 | 55 | ||
| 56 | #ifdef CONFIG_X86_INTEL_CE | ||
| 57 | extern void x86_ce4100_early_setup(void); | ||
| 58 | #else | ||
| 59 | static inline void x86_ce4100_early_setup(void) { } | ||
| 60 | #endif | ||
| 61 | |||
| 56 | #ifndef _SETUP | 62 | #ifndef _SETUP |
| 57 | 63 | ||
| 58 | /* | 64 | /* |
