summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-25 07:32:27 +0300
committerKevin Hilman <khilman@linaro.org>2015-06-25 07:32:27 +0300
commit1a429fcebf365ba8f8e9cdf7a365a7ae3fe87650 (patch)
tree86af61184ca166c2c06616d35d4170c055cc9cfc /arch/arm64
parent32270e805a1e0baf39aa040177ef1896f03b7266 (diff)
parentdec36f6ab89db2ae80a0a61f26e1ca1f6a61b651 (diff)
downloadlinux-1a429fcebf365ba8f8e9cdf7a365a7ae3fe87650.tar.xz
Merge tag 'armsoc-defconfig' into test-merge
ARM: SoC: defconfig updates for v4.2 We keep collecting defconfig updates in a separate branch mostly to encourage people to handle them separately and avoid conflicts between different topics. Most of these are enablement of new SoCs, boards or drivers that have come in, or minor config refreshes due to reorderings in Kconfig files, etc. I.e. mostly minor churn of various kinds. Conflicts: None # gpg: Signature made Wed Jun 24 21:32:27 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>"
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index ab66f1600cec..aa6d99f7f178 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -95,6 +95,7 @@ CONFIG_SMC91X=y
CONFIG_SMSC911X=y
# CONFIG_WLAN is not set
CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_SERIO_SERPORT is not set
CONFIG_SERIO_AMBAKMI=y
CONFIG_LEGACY_PTY_COUNT=16