projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
exynos_defconfig
diff --git
a/arch/arm/configs/exynos_defconfig
b/arch/arm/configs/exynos_defconfig
index
10f49ab
..
47195e8
100644
(file)
--- a/
arch/arm/configs/exynos_defconfig
+++ b/
arch/arm/configs/exynos_defconfig
@@
-82,6
+82,7
@@
CONFIG_TOUCHSCREEN_MMS114=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MAX77693_HAPTIC=y
CONFIG_INPUT_MAX8997_HAPTIC=y
+CONFIG_KEYBOARD_SAMSUNG=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y