Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master'

[oweals/u-boot.git] / board / davinci / schmoogie / schmoogie.c

diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c
index 80a0f9fccc06b92c492d54483046abe7039c5292..52d00e42060d136c8fbdb0f468850a23f855d4ac 100644 (file)
--- a/board/davinci/schmoogie/schmoogie.c
+++ b/board/davinci/schmoogie/schmoogie.c
@@ -27,15 +27,12 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       /* arch number of the board */
-       gd->bd->bi_arch_number = MACH_TYPE_SCHMOOGIE;
-
        /* address of boot parameters */
        gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;