summaryrefslogtreecommitdiffstats
path: root/config-powerpc64
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2014-04-02 20:57:21 -0400
committerJosh Boyer <jwboyer@redhat.com>2014-04-02 20:57:21 -0400
commit5ff84c8066e0676b69f2588d120cd32e553446bf (patch)
tree7259271cc4634b5662aadb796b0d4de3905e2ba3 /config-powerpc64
parent431d10db6f5fcfdc5fd2dc3dee9524c67ffac7cc (diff)
downloadkernel-5ff84c8066e0676b69f2588d120cd32e553446bf.tar.gz
kernel-5ff84c8066e0676b69f2588d120cd32e553446bf.tar.xz
kernel-5ff84c8066e0676b69f2588d120cd32e553446bf.zip
Linux v3.14-5146-g0f1b1e6d73cb
Diffstat (limited to 'config-powerpc64')
-rw-r--r--config-powerpc642
1 files changed, 2 insertions, 0 deletions
diff --git a/config-powerpc64 b/config-powerpc64
index 4b8ba84aa..e5d6d8b1b 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -14,6 +14,7 @@ CONFIG_PPC_PMAC=y
CONFIG_PPC_POWERNV=y
CONFIG_POWERNV_MSI=y
CONFIG_PPC_POWERNV_RTAS=y
+CONFIG_SENSORS_IBMPOWERNV=y
CONFIG_HW_RANDOM_POWERNV=m
CONFIG_SCOM_DEBUGFS=y
# CONFIG_PPC_PASEMI is not set
@@ -154,6 +155,7 @@ CONFIG_KVM_XICS=y
#-- active memory sharing
CONFIG_PPC_SMLPAR=y
CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
#-- DLPAR memory remove
CONFIG_SPARSEMEM_VMEMMAP=y