Sound on amd64

[Kurt Buff]

I'm trying to update the kernel in 7.0-Stable (updated today) with
either snd_hda or snd_ich, and it's erroring out during buildkernel
with one or the other of these failure messages:

For snd_ich, I get this:
In file included from /usr/src/sys/dev/sound/pcm/sound.h:94
                     from /usr/src/sys/dev/sound/pci/ich.c:28:
/usr/src/sys/dev/sound/pcm/channel.h:216:24 error: channel_if.h: No
such file or directory
In file included from /usr/src/sys/dev/sound/pci/ich.c:29:
/usr/src/sys/dev/sound/pcm/ac97.h:91:21: error ac97_if.h: No such file
or directory
mkdep: compile failed

For snd_hda, I get this:
In file included from /usr/src/sys/dev/sound/pcm/sound.h:94
                     from /usr/src/sys/dev/sound/pci/hda/hdac.c:70:
/usr/src/sys/dev/sound/pcm/channel.h:216:24 error: channel_if.h: No
such file or directory
In file included from /usr/src/sys/dev/sound/pci/ich.c:29:
/usr/src/sys/dev/sound/pci/hda/hdac.c:82:22: mixer_if.h: No such file
or directory
mkdep: compile failed


Hardware is an Lenovo Thinkpad T61 7658 CTO, and I've confirmed that
it has an Intel hda controller - or at least that is what SLES thinks
when it boots on this machine.

What next?

Kurt