[U-Boot] [PATCH] mpc83xx: fix duplicate MONITOR_LEN definition caused by merge foo

[Wolfgang Denk]

Dear Kim Phillips,

In message <20090717124744.2e420b4b.kim.phillips at freescale.com> you wrote:
> commits 4a9932a4364b548773bc131bf85e24a2ec15f2b0 and
> c9646ed758804fa1fa6c1425369a4eee5d618b1d merged and generated this build
> error:
> 
> Configuring for MPC837XERDB board...
> In file included from /home/r1aaha/git/u-boot/include/config.h:3,
>                  from include/common.h:35:
> /home/r1aaha/git/u-boot/include/configs/MPC837XERDB.h:233:1: warning: "CONFIG_SYS_MONITOR_LEN" redefined
> /home/r1aaha/git/u-boot/include/configs/MPC837XERDB.h:232:1: warning: this is the location of the previous definition
> 
> take the larger value of the two, to allow for -mmultiple-broken compilers,
> such as gcc 4.4.
> 
> Signed-off-by: Kim Phillips <kim.phillips at freescale.com>

Sorry, I ran over this and fixed it before running over your patch.

Hope this is OK with you.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
God may be subtle, but He isn't plain mean.         - Albert Einstein