Index: linux/arch/ppc/boot/simple/embed_config.c
===================================================================
--- linux.orig/arch/ppc/boot/simple/embed_config.c	2005-06-03 15:26:05.000000000 -0300
+++ linux/arch/ppc/boot/simple/embed_config.c	2005-06-03 15:34:25.000000000 -0300
@@ -23,12 +23,6 @@
 #endif
 extern unsigned long timebase_period_ns;
 
-/* For those boards that don't provide one.
-*/
-#if !defined(CONFIG_MBX)
-static	bd_t	bdinfo;
-#endif
-
 /* IIC functions.
  * These are just the basic master read/write operations so we can
  * examine serial EEPROM.
Index: linux/arch/ppc/boot/simple/misc-embedded.c
===================================================================
--- linux.orig/arch/ppc/boot/simple/misc-embedded.c	2005-06-03 15:26:05.000000000 -0300
+++ linux/arch/ppc/boot/simple/misc-embedded.c	2005-06-03 15:34:25.000000000 -0300
@@ -61,6 +61,7 @@
 
 /* We need to make sure that this is before the images to ensure
  * that it's in a mapped location. - Tom */
+#include "../../syslib/fw_bdt.h"
 bd_t hold_resid_buf __attribute__ ((__section__ (".data.boot")));
 bd_t *hold_residual = &hold_resid_buf;
 
Index: linux/arch/ppc/boot/simple/m8xx_tty.c
===================================================================
--- linux.orig/arch/ppc/boot/simple/m8xx_tty.c	2005-06-03 15:26:05.000000000 -0300
+++ linux/arch/ppc/boot/simple/m8xx_tty.c	2005-06-03 16:08:35.000000000 -0300
@@ -13,6 +13,7 @@
 #include <asm/uaccess.h>
 #include <asm/mpc8xx.h>
 #include <asm/commproc.h>
+#include "../../syslib/fw_bdt.h"
 
 #ifdef CONFIG_MBX
 #define MBX_CSR1	((volatile u_char *)0xfa100000)