summaryrefslogtreecommitdiffstats
path: root/config-powerpc64
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-10 08:31:19 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-10 08:31:19 -0400
commit9b82ecdfb861cd3daf9d01b050c4937391aec003 (patch)
tree04c35507c2c3b5cabd7ba2fcb217af3e8285c129 /config-powerpc64
parent38d8cd2ec1088b1ea6afe3520826405f20e9adcb (diff)
downloadkernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.gz
kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.xz
kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.zip
Update to Linux v3.15
Diffstat (limited to 'config-powerpc64')
-rw-r--r--config-powerpc643
1 files changed, 3 insertions, 0 deletions
diff --git a/config-powerpc64 b/config-powerpc64
index 4b8ba84aa..7f4133593 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -14,7 +14,9 @@ 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_POWERNV_CPUFREQ=m
CONFIG_SCOM_DEBUGFS=y
# CONFIG_PPC_PASEMI is not set
# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
@@ -154,6 +156,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