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

2009-07-18 Thread Wolfgang Denk
Dear Kim Phillips, In message <20090717124744.2e420b4b.kim.phill...@freescale.com> you wrote: > commits 4a9932a4364b548773bc131bf85e24a2ec15f2b0 and > c9646ed758804fa1fa6c1425369a4eee5d618b1d merged and generated this build > error: > > Configuring for MPC837XERDB board... > In file included from

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

2009-07-17 Thread Kim Phillips
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-