usb compile issue

-current on i386

two days ago, kernel compiled fine.  with just now cvsup, i blow chunks.

cc -c -O -pipe -march=pentiumpro -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I. -I/usr/src/sys -I/usr/src/sys/contrib/dev/acpica -I/usr/src/sys/contrib/altq -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/pf -I/usr/src/sys/contrib/dev/ath -I/usr/src/sys/contrib/dev/ath/freebsd -I/usr/src/sys/contrib/ngatm -D_KERNEL -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Werror  /usr/src/sys/dev/usb/usb_quirks.c
cc -c -O -pipe -march=pentiumpro -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I. -I/usr/src/sys -I/usr/src/sys/contrib/dev/acpica -I/usr/src/sys/contrib/altq -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/pf -I/usr/src/sys/contrib/dev/ath -I/usr/src/sys/contrib/dev/ath/freebsd -I/usr/src/sys/contrib/ngatm -D_KERNEL -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Werror  /usr/src/sys/dev/usb/usb_subr.c
/usr/src/sys/dev/usb/usb_subr.c: In function `usbd_setup_pipe':
/usr/src/sys/dev/usb/usb_subr.c:823: error: `Some' undeclared (first use in this function)
/usr/src/sys/dev/usb/usb_subr.c:823: error: (Each undeclared identifier is reported only once
/usr/src/sys/dev/usb/usb_subr.c:823: error: for each function it appears in.)
/usr/src/sys/dev/usb/usb_subr.c:823: error: syntax error before "device"
/usr/src/sys/dev/usb/usb_subr.c: At top level:
/usr/src/sys/dev/usb/usb_subr.c:832: warning: type defaults to `int' in declaration of `pipe'
/usr/src/sys/dev/usb/usb_subr.c:832: error: `p' undeclared here (not in a function)
/usr/src/sys/dev/usb/usb_subr.c:832: warning: data definition has no type or storage class
/usr/src/sys/dev/usb/usb_subr.c:833: error: syntax error before "return"
/usr/src/sys/dev/usb/usb_subr.c:92: warning: 'usbd_getnewaddr' declared `static' but never defined
/usr/src/sys/dev/usb/usb_subr.c:101: warning: 'usbd_kill_pipe' declared `static' but never defined
/usr/src/sys/dev/usb/usb_subr.c:103: warning: 'usbd_probe_and_attach' declared `static' but never defined
/usr/src/sys/dev/usb/usb_subr.c:105: warning: 'usb_cookie_no' defined but not used
*** Error code 1

Stop in /usr/obj/usr/src/sys/ROAM.
*** Error code 1

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


randy

---

machine		i386
cpu		I686_CPU
ident		FOO
makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
options 	SCHED_ULE		# ULE scheduler
options 	INET			# InterNETworking
options 	FFS			# Berkeley Fast Filesystem
options 	SOFTUPDATES		# Enable FFS soft updates support
options 	UFS_DIRHASH		# Improve performance on big directories
options 	MSDOSFS			# MSDOS Filesystem
options 	CD9660			# ISO 9660 Filesystem
options 	PROCFS			# Process filesystem (requires PSEUDOFS)
options 	PSEUDOFS		# Pseudo-filesystem framework
options 	GEOM_GPT		# GUID Partition Tables.
options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
options 	SCSI_DELAY=15000	# Delay (in ms) before probing SCSI
options 	KTRACE			# ktrace(1) support
options 	SYSVSHM			# SYSV-style shared memory
options 	SYSVMSG			# SYSV-style message queues
options 	SYSVSEM			# SYSV-style semaphores
options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
					# output.  Adds ~128k to driver.
					# output.  Adds ~215k to driver.
options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
options 	KDB			# Enable kernel debugger support.
options 	DDB			# Support DDB.
device		isa
device		pci
device		ata
device		atadisk		# ATA disk drives
device		atapicd		# ATAPI CDROM drives
options 	ATA_STATIC_ID	# Static device numbering
device		scbus		# SCSI bus (required for SCSI)
device		ch		# SCSI media changers
device		da		# Direct Access (disks)
device		pass		# Passthrough device (direct SCSI access)
device		ses		# SCSI Environmental Services (and SAF-TE)
device		atkbdc		# AT keyboard controller
device		atkbd		# AT keyboard
device		psm		# PS/2 mouse
device		vga		# VGA video card driver
device		splash		# Splash screen and screen saver support
device		sc
device		npx
device          acpi_video
device		pmtimer
device		cbb		# cardbus (yenta) bridge
device		pccard		# PC Card (16-bit) bus
device		cardbus		# CardBus (32-bit) bus
device		sio		# 8250, 16[45]50 based serial ports
device		ppc
device		ppbus		# Parallel port bus (required)
device		lpt		# Printer
device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
device		wlan		# 802.11 support
device		ath
device		ath_hal		# Atheros HAL (includes binary component)
device		loop		# Network loopback
device		mem		# Memory and kernel memory devices
device		io		# I/O device
device		random		# Entropy device
device		ether		# Ethernet support
device          pf              # PF OpenBSD packet-filter firewall
device		tun		# Packet tunnel.
device		pty		# Pseudo-ttys (telnet etc)
device		md		# Memory "disks"
device		gif		# IPv6 and IPv4 tunneling
device		bpf		# Berkeley packet filter
device		uhci		# UHCI PCI->USB interface
device		usb		# USB Bus (required)
device		ugen		# Generic
device		uhid		# "Human Interface Devices"
device		ukbd		# Keyboard
device		umass		# Disks/Mass storage - Requires scbus and da
device		ums		# Mouse
device		uscanner	# Scanners