diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-05-09 09:50:20 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-05-09 09:50:20 -0500 |
| commit | 168984b97ba6b8f8158bd7c5731f7656a651783f (patch) | |
| tree | 0e6d0a2e72fda4550d21b426989665d1908bb83f /config-powerpc64-generic | |
| parent | a8751b1bcf8c78d6ab81777f01b1e378692878a7 (diff) | |
| download | kernel-168984b97ba6b8f8158bd7c5731f7656a651783f.tar.gz kernel-168984b97ba6b8f8158bd7c5731f7656a651783f.tar.xz kernel-168984b97ba6b8f8158bd7c5731f7656a651783f.zip | |
Linux v4.5.3 rebase
Diffstat (limited to 'config-powerpc64-generic')
| -rw-r--r-- | config-powerpc64-generic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-powerpc64-generic b/config-powerpc64-generic index b543cfbb6..ffc765a13 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -60,6 +60,7 @@ CONFIG_MEMORY_HOTREMOVE=y CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y CONFIG_CGROUP_HUGETLB=y +CONFIG_MEM_SOFT_DIRTY=y CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 @@ -74,14 +75,13 @@ CONFIG_PSERIES_CPUIDLE=y CONFIG_HW_RANDOM_PSERIES=m CONFIG_CRYPTO_DEV_NX=y -CONFIG_CRYPTO_842=m CONFIG_CRYPTO_DEV_NX_ENCRYPT=m CONFIG_CRYPTO_DEV_NX_COMPRESS=m CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m CONFIG_CRYPTO_DEV_VMX=y -# CONFIG_CRYPTO_DEV_VMX_ENCRYPT is not set +CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_XZ_DEC_POWERPC=y @@ -352,6 +352,7 @@ CONFIG_I2C_MPC=m # CONFIG_IBM_EMAC is not set # CONFIG_NET_VENDOR_PASEMI is not set # CONFIG_NET_VENDOR_TOSHIBA is not set +CONFIG_IBMVNIC=m CONFIG_MDIO_OCTEON=m |