Lost ps/2 input in 3.2.5 (aka PCI: Rework ASPM disable code)

Hi,

so I finally decided to commit 3.2.5 into the opensuse kernel. However
it does not even work on my laptop.

Both keyboard and touchpad are not detected. They are connected via PS/2.

I see
PNP: PS/2 appears to have AUX port disabled, if this is incorrect please
boot with i8042.nopnp

Without that patch this warning is gone and devices properly enumerated.

thanks,
-- 
js
suse labs