diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 08:02:57 +0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 08:02:57 +0400 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /arch/s390/kvm/Kconfig | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
| download | linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.xz | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'arch/s390/kvm/Kconfig')
| -rw-r--r-- | arch/s390/kvm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index f66a1bdbb61d..a21634173a66 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -37,6 +37,5 @@ config KVM # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/vhost/Kconfig -source drivers/virtio/Kconfig endif # VIRTUALIZATION |