diff options
author | Avi Kivity <avi@qumranet.com> | 2008-02-01 18:00:40 +0200 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-02-01 18:00:40 +0200 |
commit | f1ca151a368192b182a9f9e696e211e18927f040 (patch) | |
tree | 0b9531c67553ee53a74a67251417e6420094c6f1 /virt | |
parent | b475283d7688169261a91d95bd636a6ab584f2b8 (diff) | |
parent | 24e1c13c93cbdd05e4b7ea921c0050b036555adc (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/Kconfig
arch/x86/Makefile
arch/x86/kvm/Kconfig
arch/x86/kvm/mmu.c
arch/x86/kvm/paging_tmpl.h
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c
arch/x86/kvm/vmx.h
arch/x86/kvm/x86.c
arch/x86/kvm/x86_emulate.c
include/asm-x86/kvm_host.h
include/linux/Kbuild
include/linux/kvm_host.h
virt/kvm/kvm_main.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index dbf5fa716f86..a499f50e6676 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1267,7 +1267,7 @@ static int kvm_resume(struct sys_device *dev) } static struct sysdev_class kvm_sysdev_class = { - set_kset_name("kvm"), + .name = "kvm", .suspend = kvm_suspend, .resume = kvm_resume, }; |