aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Muckle <smuckle@google.com>2019-10-31 15:38:06 -0700
committerAlistair Delva <adelva@google.com>2019-11-01 16:45:24 +0000
commit806aeaebc91568417df3074e39e9248dd0c2a145 (patch)
tree24a64eecc4e53a9d7c90029b9ed48a5abd47fe8d
parent256f705437fc05c981cb5b9c32ff4d6105a37dee (diff)
ANDROID: gki_defconfig: enable CONFIG_KEYBOARD_GPIOASB-2019-11-05_4.19
This driver is very commonly used in Android. Statically compile it into the GKI. Bug: 143314501 Change-Id: I12e2dd04bdde2affef1f6be9f33033d87096ec89 Signed-off-by: Steve Muckle <smuckle@google.com>
-rw-r--r--arch/arm64/configs/gki_defconfig1
-rw-r--r--arch/x86/configs/gki_defconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index d0eb9e0b3d99..aa109898e0f4 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -263,6 +263,7 @@ CONFIG_USB_USBNET=y
CONFIG_VIRT_WIFI=y
CONFIG_INPUT_FF_MEMLESS=y
CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_MISC=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 0063148af08b..d028b0e7a277 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -234,7 +234,7 @@ CONFIG_USB_USBNET=y
# CONFIG_WLAN_VENDOR_QUANTENNA is not set
CONFIG_VIRT_WIFI=m
CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_MISC=y