probleam building current

Considering I've never done this before it's probably something stupid, 
but for some reason building a new kernel is failing. I just synched my 
sources a few hours ago via cvsup and have been following the directions 
in the handbook for building world. After running cvsup one last time, I 
ran mergemaster -p and make buildworld. so then I ran make buildkernel 
and got the following little pile of compile errors:

/usr/src/sys/dev/pci/pci.c:573: conflicting types for 
`pci_enable_busmaster_method'
/usr/src/sys/dev/pci/pci_private.h:57: previous declaration of 
`pci_enable_busmaster_method'
/usr/src/sys/dev/pci/pci.c:580: conflicting types for 
`pci_disable_busmaster_method'
/usr/src/sys/dev/pci/pci_private.h:58: previous declaration of 
`pci_disable_busmaster_method'
/usr/src/sys/dev/pci/pci.c:587: conflicting types for `pci_enable_io_method'
/usr/src/sys/dev/pci/pci_private.h:59: previous declaration of 
`pci_enable_io_method'
/usr/src/sys/dev/pci/pci.c:618: conflicting types for 
`pci_disable_io_method'
/usr/src/sys/dev/pci/pci_private.h:60: previous declaration of 
`pci_disable_io_method'
/usr/src/sys/dev/pci/pci.c: In function `pci_alloc_resource':
/usr/src/sys/dev/pci/pci.c:1368: void value not ignored as it ought to be

                -Nikolas "Atrus" Coukouma
                atrus_at_wam.umd.edu
                AIM: atrustheotaku