diff --git a/[refs] b/[refs]
index 880b92555be1..100e82ec7d7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a73aa81ffb993382afed2ed404bc2b330d75427
+refs/heads/master: fb093eab6d8963a085f112773284f2bcb3d7907b
diff --git a/trunk/include/asm-x86/setup.h b/trunk/include/asm-x86/setup.h
index 64f5f0c11d66..9e163fc3e984 100644
--- a/trunk/include/asm-x86/setup.h
+++ b/trunk/include/asm-x86/setup.h
@@ -50,15 +50,9 @@ extern struct boot_params boot_params;
  */
 #define LOWMEMSIZE()	(0x9f000)
 
-struct e820entry;
-
 char * __init machine_specific_memory_setup(void);
 char *memory_setup(void);
 
-int __init copy_e820_map(struct e820entry *biosmap, int nr_map);
-void __init add_memory_region(unsigned long long start,
-			      unsigned long long size, int type);
-
 
 void __init i386_start_kernel(void);