Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-omap-h63xx.git] / include / asm-i386 / boot.h

diff --git a/include/asm-i386/boot.h b/include/asm-i386/boot.h
index 8ce79a6fa8919a7bf7557f39aa60fb6e71d1af39..bd024ab4fe53b02f6e9b0fe678defb0d1a982242 100644 (file)
--- a/include/asm-i386/boot.h
+++ b/include/asm-i386/boot.h
@@ -12,8 +12,9 @@
 #define EXTENDED_VGA   0xfffe          /* 80x50 mode */
 #define ASK_VGA                0xfffd          /* ask for it at bootup */
 
-/* Physical address where kenrel should be loaded. */
-#define LOAD_PHYSICAL_ADDR ((0x100000 + CONFIG_PHYSICAL_ALIGN - 1) \
+/* Physical address where kernel should be loaded. */
+#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
+                               + (CONFIG_PHYSICAL_ALIGN - 1)) \
                                & ~(CONFIG_PHYSICAL_ALIGN - 1))
 
 #endif /* _LINUX_BOOT_H */