Now instead of using make menuconfig, I have a godsend of an option. Check this out: copy your current .config file into /usr/src/linux. Now use "make oldconfig". It will run through your old config file and see what's been updated so that you don't have to find all the new options. For everything to do with ACPI (about the first 5 questions for me, but possibly more for you if you've never configured a pre-patched kernel) say M for module. There are an extra 3 or so things after that which I said "no" to.
In point form, this is how the kernel should be configured:
cd /usr/src/linux
cp /usr/src/<oldkernel-source-directory>/.config .config
make oldconfig (say M to all new options for ACPI--you can also say "Y" if you prefer to compile it directly into your kernel)
Now go in to the config file with make menuconfig. I want you do check and make sure you have your APM (the old stuff) turned off. Under "", make sure that:
is ON
is OFF (this is the old one--you don't even want it as a module unless you really know what you're doing. And if you really know what you're doing you're probably not reading this.)
everything to do with ACPI should be M (modules) or * (compiled directly into the kernel)
exit and save the new configuration