diff options
| author | Timo Sigurdsson <public_timo.s@silentcreek.de> | 2015-11-20 02:46:18 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-11-20 12:47:53 +0100 |
| commit | c54075e2588ec19a54ae8fd718118f3f8d11896c (patch) | |
| tree | 9ed71fc8cbba347139385f3f89660817b4d6c978 /arch/arm/configs/sunxi_defconfig | |
| parent | ARM: sunxi: Re-enable SID driver in sunxi_defconfig (diff) | |
| download | linux-c54075e2588ec19a54ae8fd718118f3f8d11896c.tar.xz linux-c54075e2588ec19a54ae8fd718118f3f8d11896c.zip | |
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 <public_timo.s@silentcreek.de>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/configs/sunxi_defconfig')
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
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 |