Merge branch 'core/locking' into core/urgent

[linux-2.6] / include / asm-x86 / mach-voyager / setup_arch.h

diff --git a/include/asm-x86/mach-voyager/setup_arch.h b/include/asm-x86/mach-voyager/setup_arch.h
index 84d01ad334593a99083ec0dcc96873b10e3c611e..71729ca05cd738308eabc7f61ba6cb94dff94554 100644 (file)
--- a/include/asm-x86/mach-voyager/setup_arch.h
+++ b/include/asm-x86/mach-voyager/setup_arch.h
@@ -1,5 +1,7 @@
 #include <asm/voyager.h>
-#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *)(PARAM+0x40))
+#include <asm/setup.h>
+#define VOYAGER_BIOS_INFO ((struct voyager_bios_info *) \
+                       (&boot_params.apm_bios_info))
 
 /* Hook to call BIOS initialisation function */