diff --git a/[refs] b/[refs]
index 6d2fe19849ee..c1f562374e58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70a20025632ca320316b5068326784d07c8ff351
+refs/heads/master: 6fc30f9e292d2275248b6ee5ca903248b66efca1
diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
index 9074aa7ebc65..4eddf2761804 100644
--- a/trunk/include/asm-x86/proto.h
+++ b/trunk/include/asm-x86/proto.h
@@ -25,8 +25,6 @@ extern void ia32_sysenter_target(void);
 extern void config_acpi_tables(void);
 extern void ia32_syscall(void);
 
-extern int nohpet;
-
 extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
 
 extern void load_gs_index(unsigned gs);