diff --git a/[refs] b/[refs] index f338a340dc01..dc02f1843b37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19f0dda91e0dcb38c97bbfcff62b108a3bbc7907 +refs/heads/master: bed23c67fe077b4d66cb3329263d7cfa33b3fd67 diff --git a/trunk/arch/x86/kernel/efi.c b/trunk/arch/x86/kernel/efi.c index a70fe77354b8..174b067b9d03 100644 --- a/trunk/arch/x86/kernel/efi.c +++ b/trunk/arch/x86/kernel/efi.c @@ -371,11 +371,9 @@ void __init efi_init(void) printk(KERN_WARNING "Kernel-defined memdesc" "doesn't match the one from EFI!\n"); -#ifdef CONFIG_X86_64 /* Setup for EFI runtime service */ reboot_type = BOOT_EFI; -#endif #if EFI_DEBUG print_efi_memmap(); #endif