[U-Boot] [PATCH-OMAP3] OMAP3: Fix merge error in omap3 header

[Jean-Christophe PLAGNIOL-VILLARD]

On 18:28 Fri 21 Nov     , Dirk Behme wrote:
> Fix merge error.
> 
> Signed-off-by: Dirk Behme <dirk.behme at googlemail.com>
> 
> ---
apply to u-boot-arm/omap3
> 
> Jean-Christophe: Regarding
> 
> http://lists.denx.de/pipermail/u-boot/2008-November/043711.html
> 
> this is the only issue I can find in omap3.h. It doesn't seem to me
> that you removed anything (??)
I've merge it manually

next time make the pacth numbered and thread to not waste to find
the order to apply them

Best Regards,
J.