summaryrefslogtreecommitdiff
path: root/arch/x86/machine/boot.c
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-03-14 02:01:23 +0100
committerRichard Braun <rbraun@sceen.net>2017-03-14 02:01:23 +0100
commit3578ec83e47c757dc69af2f2876bba5218b38d68 (patch)
treeeaf52f6fbe99ef36a2e6c39a16e59714b3e7562c /arch/x86/machine/boot.c
parentf85ad668fafcfac5887cad39519ff8a34624a4a0 (diff)
Use the X15 namespace consistently for macros defined by autoconf
Diffstat (limited to 'arch/x86/machine/boot.c')
-rw-r--r--arch/x86/machine/boot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index 36eba21e..aaf3f1ea 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -288,10 +288,10 @@ boot_setup_paging(struct multiboot_raw_info *mbi, unsigned long eax)
static void __init
boot_show_version(void)
{
- printk(KERNEL_NAME "/" QUOTE(X86_MACHINE) " " KERNEL_VERSION
-#ifdef X86_PAE
+ printk(KERNEL_NAME "/" QUOTE(X15_X86_MACHINE) " " KERNEL_VERSION
+#ifdef X15_X86_PAE
" PAE"
-#endif /* X86_PAE */
+#endif /* X15_X86_PAE */
"\n");
}