FreeBSD-current kernel can not be built

Hi all,

It seems that the latest CURRENT kernel can not be built. I used 'make
buildkernel KERNCONF=CURRENT' to build a new kernel and got an error:

--------------------------------------------------------------
>>> Kernel build for CURRENT started on Sun Jan 23 01:03:57 CST 2011
--------------------------------------------------------------
===> CURRENT
mkdir -p /usr/obj/usr/src/sys

--------------------------------------------------------------
>>> stage 1: configuring the kernel
--------------------------------------------------------------
cd /usr/src/sys/i386/conf;
 PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin
 config  -d /usr/obj/usr/src/sys/CURRENT  /usr/src/sys/i386/conf/CURRENT
../../conf/options: Duplicate option USB_HOST_ALIGN.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

-----------------------------------------
I reviewed the source code in svn and perforce repository. It has a
duplicate option USB_HOST_ALIGN in conf/options. I attach a patch file to
fix it.

Best regards,
lz