Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / powerpc / configs / pseries_defconfig

diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 96a58b709705ccae5e071aa474f19b7f1a506ce0..a72f2415a64709193a20f6aa16b117da4f1ea075 100644 (file)
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -362,3 +362,7 @@ CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_VHOST_NET=m