diff --git a/[refs] b/[refs]
index a1d51e8f9781..c421afb85329 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f8182106890970bb13bed325f0a04aef931883d
+refs/heads/master: 434b3d3209a8d8dcda63c3b14815659f4671b0a8
diff --git a/trunk/include/asm-x86/mach-voyager/setup_arch.h b/trunk/include/asm-x86/mach-voyager/setup_arch.h
index 1710ae10eb67..71729ca05cd7 100644
--- a/trunk/include/asm-x86/mach-voyager/setup_arch.h
+++ b/trunk/include/asm-x86/mach-voyager/setup_arch.h
@@ -1,5 +1,5 @@
 #include <asm/voyager.h>
-#include <asm/setup_32.h>
+#include <asm/setup.h>
 #define VOYAGER_BIOS_INFO ((struct voyager_bios_info *) \
 			(&boot_params.apm_bios_info))