diff --git a/[refs] b/[refs] index 38566154f27c..9a9b5f07038f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 330ddd20894f99a2b956ad59cf0cfdba188bde63 +refs/heads/master: 102e3b8d3f3d5556c60f9ab6d92108649b68edc8 diff --git a/trunk/include/asm-x86/setup.h b/trunk/include/asm-x86/setup.h index 269ba7fe21d1..42bc62b4b70c 100644 --- a/trunk/include/asm-x86/setup.h +++ b/trunk/include/asm-x86/setup.h @@ -56,6 +56,8 @@ extern void probe_roms(void); extern unsigned long init_pg_tables_start; extern unsigned long init_pg_tables_end; +#else +void __init x86_64_start_kernel(char *real_mode); #endif /* __i386__ */ #endif /* _SETUP */ #endif /* __ASSEMBLY__ */