From: Timo Sigurdsson Date: Fri, 20 Nov 2015 01:46:18 +0000 (+0100) Subject: ARM: sunxi: Really enable LRADC keys in sunxi_defconfig X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c54075e2588ec19a54ae8fd718118f3f8d11896c;p=linux-beck.git ARM: sunxi: Really enable LRADC keys in sunxi_defconfig Commit be8becb81bdc ("ARM: sunxi_defconfig: Enable LRADC keys (KEYBOARD_SUN4I_LRADC)") added CONFIG_KEYBOARD_SUN4I_LRADC=y to sunxi_defconfig. However, it depends on CONFIG_KEYBOARD which is explicitly disabled in sunxi_defconfig. Hence, the LRADC keys were never actually enabled. Remove the line disabling CONFIG_KEYBOARD in order to really enable KEYBOARD_SUN4I_LRADC. Signed-off-by: Timo Sigurdsson Acked-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 603dc8c97c42..2a3641cd1351 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -60,7 +60,6 @@ CONFIG_STMMAC_ETH=y # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_AXP20X_PEK=y