Build failure - multiple definition of `env_get_char'

As of:
----
a8409f4f1ac84c36273c1a1e341189662521bcfb is first bad commit commit a8409f4f1ac84c36273c1a1e341189662521bcfb

Author: Wolfgang Denk <[email protected]>
Date:   Wed May 14 12:22:49 2008 +0200

environment: cleanup prototype declarations of env functions.
----

I am unable to build u-boot. I observed this problem originally when building for gta01bv4 with Openmoko-specific patches, but I am able to reproduce the problem with a clean checkout of
git://git.denx.de/u-boot.git configured for "mp2usb" (chosen arbitrarily).

The error messages from the "mp2usb" build failure are below, and I can provide more information if needed:

.a drivers/video/libvideo.a common/libcommon.a libfdt/libfdt.a

api/libapi.a post/libpost.a | \
		sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
		cd /home/mmontour/moko/build/u_tmp/u-boot && 

arm-angstrom-linux-gnueabi-ld -Bstatic -T /home/mmontour/moko/build/u_tmp/u-boot/board/mp2usb/u-boot.lds -Ttext
0x27F00000 $UNDEF_SYM cpu/arm920t/start.o \
--start-group lib_generic/libgeneric.a cpu/arm920t/libarm920t.a
cpu/arm920t/at91rm9200/libat91rm9200.a lib_arm/libarm.a
fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a
fs/jffs2/libjffs2.a fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
net/libnet.a disk/libdisk.a drivers/bios_emulator/libatibiosemu.a drivers/block/libblock.a drivers/dma/libdma.a drivers/hwmon/libhwmon.a drivers/i2c/libi2c.a drivers/input/libinput.a drivers/misc/libmisc.a
drivers/mtd/libmtd.a drivers/mtd/nand/libnand.a
drivers/mtd/nand_legacy/libnand_legacy.a
drivers/mtd/onenand/libonenand.a drivers/net/libnet.a
drivers/net/sk98lin/libsk98lin.a drivers/pci/libpci.a
drivers/pcmcia/libpcmcia.a drivers/spi/libspi.a drivers/rtc/librtc.a drivers/serial/libserial.a drivers/usb/libusb.a drivers/video/libvideo.a common/libcommon.a libfdt/libfdt.a api/libapi.a post/libpost.a
board/mp2usb/libmp2usb.a --end-group -L /home/mmontour/moko/build/tmp/cross/lib/gcc/arm-angstrom-linux-gnueabi/4.1.2
-lgcc \
-Map u-boot.map -o u-boot
common/libcommon.a(cmd_nvedit.o): In function `envmatch':
/home/mmontour/moko/build/u_tmp/u-boot/common/cmd_nvedit.c:566: multiple
definition of `env_get_char' common/libcommon.a(cmd_bootm.o):/home/mmontour/moko/build/u_tmp/u-boot/include/linux/byteorder/swab.h:113:
first defined here
common/libcommon.a(env_common.o):(.data+0x0): multiple definition of
`env_get_char' common/libcommon.a(cmd_bootm.o):/home/mmontour/moko/build/u_tmp/u-boot/include/linux/byteorder/swab.h:113:
first defined here
common/libcommon.a(env_flash.o): In function `env_get_char_spec':
/home/mmontour/moko/build/u_tmp/u-boot/common/env_flash.c:94: multiple
definition of `env_get_char' common/libcommon.a(cmd_bootm.o):/home/mmontour/moko/build/u_tmp/u-boot/include/linux/byteorder/swab.h:113:
first defined here
make: *** [u-boot] Error 1

This problem should be fixed.

Patch follows in next message.

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
The price one pays for pursuing any profession,  or  calling,  is  an
intimate knowledge of its ugly side.                  - James Baldwin