Ath5k: suspend/resume fixes

[linux-2.6] / include / asm-x86 / proto.h

diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 1e17bcce450e0ffcb47dbea2939c7366f769f29f..3dd458c385c0532b59ce3aac67386ad215665dc9 100644 (file)
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -14,13 +14,15 @@ extern void ia32_syscall(void);
 extern void ia32_cstar_target(void);
 extern void ia32_sysenter_target(void);
 
-extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
-
 extern void syscall32_cpu_init(void);
 
 extern void check_efer(void);
 
+#ifdef CONFIG_X86_BIOS_REBOOT
 extern int reboot_force;
+#else
+static const int reboot_force = 0;
+#endif
 
 long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);