From: Stefan Roese <sr@denx.de>
Date: Tue, 21 Aug 2007 14:33:33 +0000 (+0200)
Subject: Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
X-Git-Tag: v2008.10-rc1~874^2~40
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fkernel%2Fu-boot.git;a=commitdiff_plain;h=93f798346033a1f6d22090b47abad4be88243b04

Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
---

93f798346033a1f6d22090b47abad4be88243b04
diff --cc include/configs/lwmon5.h
index 14a200d,7116c49..cf8ff45
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@@ -34,9 -34,7 +34,8 @@@
  #define CONFIG_SYS_CLK_FREQ	33300000	/* external freq to pll	*/
  
  #define CONFIG_BOARD_EARLY_INIT_F 1	/* Call board_early_init_f	*/
 +#define CONFIG_BOARD_POSTCLK_INIT 1	/* Call board_postclk_init	*/
  #define CONFIG_MISC_INIT_R	1	/* Call misc_init_r		*/
- #define CONFIG_ADD_RAM_INFO	1	/* Print additional info	*/
  
  /*-----------------------------------------------------------------------
   * Base addresses -- Note these are effective addresses where the