Configuration for g_serial (Gadget Serial)

[Geary]

I'm trying to configure and rebuild a kernel for an Evo to include the
g_serial USB driver. But I can't seem to find the right configuration.
My last attempt was to simply replace the the Android Gadget driver
with the Serial Gadget (with CDC ACM and CDC OBEX support) driver
using menuconfig. But running make results in these redefinition
errors:

CC drivers/usb/gadget/msm72k_udc.o
CC drivers/usb/gadget/serial.o
drivers/usb/gadget/serial.c:140: error: redefinition of
'serial_bind_config'
drivers/usb/gadget/f_serial.c:827: note: previous definition of
'serial_bind_config' was here
drivers/usb/gadget/serial.c:248: error: redefinition of 'init'
drivers/usb/gadget/f_serial.c:846: note: previous definition of 'init'
was here
drivers/usb/gadget/serial.c:276: error: redefinition of
'__initcall_init6'
drivers/usb/gadget/f_serial.c:852: note: previous definition of
'__initcall_init6' was here
make[2]: *** [drivers/usb/gadget/serial.o] Error 1
make[1]: *** [drivers/usb/gadget] Error 2
make: *** [drivers] Error 2

Has anyone succeeded in getting the Gadget Serial driver to build?
Below is the USB section of my .config. The only strange thing I see
is CONFIG_USB_ARCH_HAS_HCD=y, which I don't understand since it seems
to imply a Host controller, and I only want gadget or slave side
support. Thanks for any hints or help you can provide.

CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_USB_GADGET_MUSB_HDRC is not set

#
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
#
CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
# CONFIG_USB_GADGET_FSL_USB2 is not set
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
# CONFIG_USB_GADGET_PXA25X is not set
# CONFIG_USB_GADGET_R8A66597 is not set
# CONFIG_USB_GADGET_PXA27X is not set
# CONFIG_USB_GADGET_S3C_HSOTG is not set
# CONFIG_USB_GADGET_IMX is not set
# CONFIG_USB_GADGET_S3C2410 is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_FSL_QE is not set
# CONFIG_USB_GADGET_CI13XXX is not set
# CONFIG_USB_GADGET_NET2280 is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LANGWELL is not set
CONFIG_USB_GADGET_MSM_72K=y
CONFIG_USB_MSM_72K=y
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_ETH is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
CONFIG_USB_G_SERIAL=y
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_ANDROID is not set
# CONFIG_USB_CDC_COMPOSITE is not set

#
# OTG and related infrastructure
#
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_NOP_USB_XCEIV is not set

#
# USB Function Support
#
# CONFIG_USB_FUNCTION is not set

[Geary]

Follow-up. Looks like I was approaching this entirely wrong. Instead,
I turned on CONFIG_USB_ANDROID_ACM and used the Android Gadget
composite driver. At first, couldn't get it to compile, but then I
found other posts, e.g., http://atechyblog.blogspot.com/2010/08/enabling-serial-port-on-nexus-one.html,
that said to turn off CONFIG_MSM_SERIAL_DEBUGGER and
CONFIG_MSM_FIQ_SUPPORT. Now the make seems to be working. At least,
it's well past the USB drivers. Haven't flashed the kernel yet and
tested, but it looks promising.