| commit | e9b39bb30e2c2cb0ef7da74013729c5fcdbea275 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Aug 16 22:03:22 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Thu Aug 16 22:03:22 2012 -0700 |
| tree | dbb1c694c0b779163ef2f09fdadab676fa399fdd | |
| parent | ec4f1c4556018c2cb48a15a1036679559e997f1d [diff] | |
| parent | a16ab49b517ef4796ecde675cbb30638050a3693 [diff] |
Merge "defconfig: 8974: Enable GPIO keys driver" into msm-3.4
diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig index e231db6..0405d1b 100644 --- a/arch/arm/configs/msm8974_defconfig +++ b/arch/arm/configs/msm8974_defconfig
@@ -126,6 +126,7 @@ # CONFIG_MSM_RMNET is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m +CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y