commit 93681616 upstream.

This reverts commit 5beea882 as it
breaks trackpoint operation on XT2.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>