SMP on 1-6 Branch

I've tried config'ing GENERIC.MP and it fails with the following error:
/usr/src/sys/arch/i386/conf# config GENERIC.MP
../../../../arch/i386/conf/files.i386:489: redefinition of `spic_acpi'
*** Stop.

If I comment out the offending lines (the attach/file commands for the Sony SPIC), it configs but does not compile correctly, any
suggestions?

-Marcus

<cvs>
cd src/sys
cvs update -r netbsd-1-6 -dPA
cd arch/i386
cvs update -r sommerfeld_i386mp_1 -dPA .
</cvs>