diff --git a/[refs] b/[refs]
index de79765c6711..f4f30c11ca90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e5609a97acef44440f233ad435dd0ab563608f9
+refs/heads/master: 915cd5aa0adbe0f62b7a56d6eaf6908b47f80395
diff --git a/trunk/include/asm-x86/setup.h b/trunk/include/asm-x86/setup.h
index f745de211191..fa6763af8d26 100644
--- a/trunk/include/asm-x86/setup.h
+++ b/trunk/include/asm-x86/setup.h
@@ -55,8 +55,8 @@ struct e820entry;
 char * __init machine_specific_memory_setup(void);
 char *memory_setup(void);
 
-int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
-int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
+int __init copy_e820_map(struct e820entry *biosmap, int nr_map);
+int __init sanitize_e820_map(struct e820entry *biosmap, char *pnr_map);
 void __init add_memory_region(unsigned long long start,
 			      unsigned long long size, int type);