diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-05-21 22:17:04 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-21 22:17:04 -0400 |
commit | da90872924556bce070132e353b653e3ce88aa1a (patch) | |
tree | fcfdad8d4e04bbdddd2e3ebcba85bfbb14cbf8d8 /config-s390x | |
parent | 3dd0fcf0aa26baa4e8e02c7cd298616128c4b980 (diff) | |
download | kernel-da90872924556bce070132e353b653e3ce88aa1a.tar.gz kernel-da90872924556bce070132e353b653e3ce88aa1a.tar.xz kernel-da90872924556bce070132e353b653e3ce88aa1a.zip |
Update configs for first 3.5 merge window git snapshot
Diffstat (limited to 'config-s390x')
-rw-r--r-- | config-s390x | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x index f03942191..848709dfb 100644 --- a/config-s390x +++ b/config-s390x @@ -197,6 +197,7 @@ CONFIG_QETH_L3=m CONFIG_CRYPTO_SHA512_S390=m CONFIG_VIRTUALIZATION=y CONFIG_KVM=m +# CONFIG_KVM_S390_UCONTROL is not set CONFIG_S390_GUEST=y |