summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-08 12:10:10 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-08 12:10:33 -0400
commitda99f20f026faababa016afb0c23cc8af405f4ee (patch)
treea3accab6d05f4367a2a50875dab9f6999de2b82e /config-armv7
parentce8e218a5e0856615ab3d25219fe73a576faa213 (diff)
downloadkernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.gz
kernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.xz
kernel-da99f20f026faababa016afb0c23cc8af405f4ee.zip
Linux v3.17-2860-gef0625b70dac
- Reenable debugging options. - Temporarily disable aarch64patches
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv72
1 files changed, 2 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index 133a31064..d6dfd043b 100644
--- a/config-armv7
+++ b/config-armv7
@@ -164,6 +164,7 @@ CONFIG_RTC_DRV_PALMAS=m
CONFIG_OMAP5_DSS_HDMI=y
CONFIG_OMAP5_DSS_HDMI_AUDIO=y
CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
CONFIG_WL_TI=y
CONFIG_WLCORE_SDIO=m
@@ -486,6 +487,7 @@ CONFIG_I2C_RK3X=m
CONFIG_SPI_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_PWM_ROCKCHIP=m
+CONFIG_ROCKCHIP_SARADC=m
# ST Ericsson
CONFIG_MACH_HREFV60=y