summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-05-04 09:06:32 +0100
committerPeter Robinson <pbrobinson@gmail.com>2015-05-04 09:06:32 +0100
commit147ecfb6e4b16976ce1e7d6663888cba85123184 (patch)
tree601d9bd75be4858908b44d2b1ba74ef5378b667c /config-armv7
parent2e3090902b7028c79a57bed28cbecb2baeaf7a0a (diff)
downloadkernel-147ecfb6e4b16976ce1e7d6663888cba85123184.tar.gz
kernel-147ecfb6e4b16976ce1e7d6663888cba85123184.tar.xz
kernel-147ecfb6e4b16976ce1e7d6663888cba85123184.zip
General ARMv7 updates
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv75
1 files changed, 3 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 32fc8973e..6b355bd88 100644
--- a/config-armv7
+++ b/config-armv7
@@ -259,6 +259,7 @@ CONFIG_TI_AM335X_ADC=m
CONFIG_PWM_TIPWMSS=y
CONFIG_MFD_TPS65218=m
CONFIG_REGULATOR_TPS65218=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
CONFIG_VIDEO_AM437X_VPFE=m
# QCom
@@ -311,6 +312,7 @@ CONFIG_MFD_PM8XXX=m
CONFIG_KEYBOARD_PMIC8XXX=m
CONFIG_INPUT_PM8XXX_VIBRATOR=m
CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_INPUT_PM8941_PWRKEY=m
CONFIG_RTC_DRV_PM8XXX=m
# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
CONFIG_QCOM_WDT=m
@@ -319,7 +321,6 @@ CONFIG_SPMI=m
CONFIG_SPMI_MSM_PMIC_ARB=m
CONFIG_QCOM_SPMI_IADC=m
CONFIG_QCOM_SPMI_VADC=m
-CONFIG_INPUT_PM8941_PWRKEY=m
CONFIG_LEDS_PM8941_WLED=m
CONFIG_SND_SOC_QCOM=m
CONFIG_SND_SOC_LPASS_CPU=m
@@ -567,7 +568,7 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
CONFIG_COMMON_CLK_AXI_CLKGEN=m
CONFIG_COMMON_CLK_SI570=m
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
-CONFIG_ARM_ZYNQ_CPUIDLE=y
+# CONFIG_ARM_ZYNQ_CPUIDLE is not set
CONFIG_LATTICE_ECP3_CONFIG=m
CONFIG_NET_VENDOR_XILINX=y
CONFIG_XILINX_EMACLITE=m