--- a/kernel/arch/x86/configs/android-x86_defconfig	2015-06-23 01:46:36.000000000 -0400
+++ b/kernel/arch/x86/configs/android-x86_defconfig	2015-06-24 13:53:56.380847558 -0400
@@ -4720,7 +4720,7 @@
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_MULTITOUCH=y
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -5529,6 +5529,7 @@
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 # CONFIG_PVPANIC is not set
+CONFIG_SURFACE_BUTTON=y
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y