RELENG_6 buildkernel broken -- mfi/mpt commits

[Jeremy Chadwick]

Seems some latest comments to mpt(4) and/or mfi(4) broke RELENG_6.
Scott, this looks like your doing.  *poke poke*  :-) I've two separate
boxes which now can't build world.

http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/mfi/mfi_cam.c

-- 
| Jeremy Chadwick                                    jdc at parodius.com |
| Parodius Networking                           http://www.parodius.com/ |
| UNIX Systems Administrator                      Mountain View, CA, USA |
| Making life hard for others since 1977.                  PGP: 4BD6C0CB |

=== SNIP ===

Connecting to cvsup4.freebsd.org
Connected to 204.152.184.73
Server software version: SNAP_16_1h
Negotiating file attribute support
Exchanging collection information
Establishing multiplexed-mode data connection
Running
Updating collection src-all/cvs
 Delete src/contrib/file/.FREEBSD-upgrade.swp
 Edit src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
  Add delta 1.883.2.74 2007.06.04.18.26.35 bmah
 Edit src/sys/conf/NOTES
  Add delta 1.1325.2.33 2007.06.05.21.31.11 scottl
 Edit src/sys/conf/files
  Add delta 1.1031.2.62 2007.06.05.21.31.10 scottl
 Edit src/sys/dev/bce/if_bce.c
  Add delta 1.2.2.15 2007.06.05.01.56.08 davidch
 Edit src/sys/dev/bce/if_bcereg.h
  Add delta 1.1.2.6 2007.06.05.01.56.08 davidch
 Edit src/sys/dev/em/if_em.c
  Add delta 1.65.2.23 2007.06.05.17.44.01 jfv
 Edit src/sys/dev/mfi/mfi.c
  Add delta 1.3.2.6 2007.06.05.21.27.21 scottl
 Checkout src/sys/dev/mfi/mfi_cam.c
 Edit src/sys/dev/mfi/mfireg.h
  Add delta 1.1.2.5 2007.06.05.21.27.21 scottl
 Edit src/sys/dev/mfi/mfivar.h
  Add delta 1.1.2.5 2007.06.05.21.27.22 scottl
 Edit src/sys/dev/mpt/mpilib/mpi.h
  Add delta 1.6.2.2 2007.06.05.21.32.57 scottl
 Edit src/sys/dev/mpt/mpilib/mpi_cnfg.h
  Add delta 1.6.2.2 2007.06.05.21.32.57 scottl
 Edit src/sys/dev/mpt/mpilib/mpi_init.h
  Add delta 1.6.2.2 2007.06.05.21.32.57 scottl
 Edit src/sys/dev/mpt/mpilib/mpi_ioc.h
  Add delta 1.6.2.2 2007.06.05.21.32.57 scottl
 Delete src/sys/dev/mpt/mpilib/mpi_log_fc.h
 Delete src/sys/dev/mpt/mpilib/mpi_log_sas.h
 Edit src/sys/dev/mpt/mpilib/mpi_raid.h
  Add delta 1.6.2.2 2007.06.05.21.32.57 scottl
 Edit src/sys/dev/mpt/mpilib/mpi_sas.h
  Add delta 1.2.2.2 2007.06.05.21.32.57 scottl
 Edit src/sys/dev/mpt/mpilib/mpi_targ.h
  Add delta 1.5.2.2 2007.06.05.21.32.57 scottl
 Edit src/sys/dev/mpt/mpt.c
  Add delta 1.12.2.6 2007.06.05.21.32.56 scottl
 Edit src/sys/dev/mpt/mpt.h
  Add delta 1.6.2.7 2007.06.05.21.32.56 scottl
 Edit src/sys/dev/mpt/mpt_cam.c
  Add delta 1.1.2.11 2007.06.05.21.32.56 scottl
 Edit src/sys/modules/mfi/Makefile
  Add delta 1.1.2.4 2007.06.05.21.31.11 scottl
 Checkout src/sys/modules/mfi/mfip/Makefile
Shutting down connection to server
Finished successfully
eos# make buildkernel

--------------------------------------------------------------
>>> Kernel build for EOS started on Tue Jun  5 15:31:14 PDT 2007
--------------------------------------------------------------

{snip}

===> mem (cleandir)
rm -f export_syms mem.ko mem.kld memdev.o mem.o memutil.o i686_mem.o k6_mem.o @ machine mem.ko.debug bus_if.h device_if.h
rm -f .depend GPATH GRTAGS GSYMS GTAGS
===> mfi (cleandir)
rm -f export_syms mfi.ko mfi.kld mfi.o mfi_pci.o mfi_disk.o mfi_debug.o @ machine mfi.ko.debug opt_mfi.h pci_if.h bus_if.h device_if.h
===> mfi/mfi_cam (clean)
cd: can't cd to /usr/src/sys/modules/mfi/mfi_cam
*** Error code 2

Stop in /usr/src/sys/modules/mfi.
*** Error code 1

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