tools/mkenvimage.c: Fix a merge issue
authorHorst Kronstorfer <hkronsto@frequentis.com>
Sat, 24 Dec 2011 00:41:58 +0000 (00:41 +0000)
committerWolfgang Denk <wd@denx.de>
Thu, 5 Jan 2012 15:36:44 +0000 (16:36 +0100)
commit72ebafbe2bd5044eecbfdaa132390a1421db25be
tree9a5e40782cdf1cc63f6cd65c6024076aa3476a49
parent6f403bad80224b9cfc5c97cb2ac1b608d1777d0d
tools/mkenvimage.c: Fix a merge issue

With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
tools/mkenvimage.c