| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Siarhei Vishniakou <svv@google.com> |
| Date: Wed, 8 Jan 2020 18:19:25 -0800 |
| Subject: ANDROID: Enable HID_STEAM and JOYSTICK_XPAD as y |
| |
| These configs will now be required in aosp/1204022. |
| |
| Change-Id: Ib2961a9abf545f483cd5691f04b93cffd011ec82 |
| Signed-off-by: Siarhei Vishniakou <svv@google.com> |
| Bug: 136263708 |
| Test: none |
| --- |
| arch/arm64/configs/gki_defconfig | 3 ++- |
| arch/x86/configs/gki_defconfig | 3 ++- |
| 2 files changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| index 9bc9ef51c81d..156624c5faeb 100644 |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -279,6 +279,7 @@ CONFIG_INPUT_EVDEV=y |
| CONFIG_KEYBOARD_GPIO=y |
| # CONFIG_INPUT_MOUSE is not set |
| CONFIG_INPUT_JOYSTICK=y |
| +CONFIG_JOYSTICK_XPAD=y |
| CONFIG_INPUT_MISC=y |
| CONFIG_INPUT_UINPUT=y |
| # CONFIG_VT is not set |
| @@ -341,8 +342,8 @@ CONFIG_HID_MICROSOFT=y |
| CONFIG_HID_MULTITOUCH=y |
| CONFIG_HID_PLANTRONICS=y |
| CONFIG_HID_SONY=y |
| +CONFIG_HID_STEAM=y |
| CONFIG_USB_HIDDEV=y |
| -CONFIG_USB=y |
| CONFIG_USB_OTG=y |
| CONFIG_USB_GADGET=y |
| CONFIG_USB_DUMMY_HCD=m |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| index 2e02a1cce49f..5a8f671329a2 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -247,6 +247,7 @@ CONFIG_INPUT_EVDEV=y |
| CONFIG_KEYBOARD_GPIO=y |
| # CONFIG_INPUT_MOUSE is not set |
| CONFIG_INPUT_JOYSTICK=y |
| +CONFIG_JOYSTICK_XPAD=y |
| CONFIG_INPUT_MISC=y |
| CONFIG_INPUT_UINPUT=y |
| # CONFIG_VT is not set |
| @@ -292,8 +293,8 @@ CONFIG_HID_MICROSOFT=y |
| CONFIG_HID_MULTITOUCH=y |
| CONFIG_HID_PLANTRONICS=y |
| CONFIG_HID_SONY=y |
| +CONFIG_HID_STEAM=y |
| CONFIG_USB_HIDDEV=y |
| -CONFIG_USB=y |
| CONFIG_USB_GADGET=y |
| CONFIG_USB_DUMMY_HCD=m |
| CONFIG_USB_CONFIGFS=y |
