I decided to try a standard GENERIC_LAPTOP again on my Thinkpad.  As 
happened the last time I tried it, it didn't work well.  The problem is 
that it has

	acpi0 at mainbus 0

which -- for me, at least -- disables APM.  On other other hand, it 
doesn't have all the other changes that GENERIC.MPACPI has to actually 
use ACPI.  Of particular would be things like acpibat, acpiacad, and 
acpilid (though I'm not clear on how much of that is actually 
implemented).

So -- should we take acpi0 out of GENERIC_LAPTOP and instead create
GENERIC_LAPTOP.ACPI?

		--Steven M. Bellovin, http://www.cs.columbia.edu/~smb