summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-01-25 15:46:21 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-01-25 15:46:21 +0000
commit7430c1fa4d84b53c1ee59493bd6b938739e58f78 (patch)
treefdcb66c93930aa2712928f1e0c15495546f27281 /config-arm-generic
parent6fc2a346183696cd30401672f2d4238ba534336d (diff)
downloadkernel-7430c1fa4d84b53c1ee59493bd6b938739e58f78.tar.gz
kernel-7430c1fa4d84b53c1ee59493bd6b938739e58f78.tar.xz
kernel-7430c1fa4d84b53c1ee59493bd6b938739e58f78.zip
- Initial ARM config updates for 3.14
- Disable highbank cpuidle driver - Enable mtd-nand drivers on ARM - Update CPU thermal scaling options for ARM
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index ce9d59d1..8ea730c0 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -76,6 +76,7 @@ CONFIG_OF_PCI_IRQ=m
CONFIG_OF_PCI=m
# CONFIG_OF_SELFTEST is not set
CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_THERMAL_OF=y
# External Connectors
CONFIG_EXTCON=m
@@ -131,6 +132,7 @@ CONFIG_MFD_CORE=m
CONFIG_SMC91X=m
CONFIG_SMC911X=m
+CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_GOV_USER_SPACE=y
# CONFIG_CRYPTO_TEST is not set