Ok, I'm trying to get the sommerfeld_i386mp_1 branch, to put that other
heater in my PC to work.  I did:

george# cd /usr/src/sys
george# cvs update -D 20020127
<...>
george# cd /arch/i386
george# cvs update -rsommerfeld_i386mp_1
<...>
george# cd conf
george# config GENERIC.MP
../../../../arch/i386/conf/files.i386:151: undefined attribute `acpibus'
../../../../dev/pcmcia/files.pcmcia:76: redefinition of `wi'
../../../../arch/i386/conf/files.i386:480: cannot open
../../../../dev/acpi/files.acpi for reading: No such file or directory

Now, I know there's gotta be some bone-headed mistake here, because I
haven't been doing this long enough to make subtle mistakes yet.  Will
anyone point it out to me?

Thanks!

Bob