diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-18 05:13:38 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-18 05:13:38 +0200 |
| commit | 287638b2c533165c3c03dfa15196c2ba583cd287 (patch) | |
| tree | e753dd2cd7421a26e179c43d7f6d4d39541a4afb /drivers/virtio/virtio_pci.c | |
| parent | Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/l... (diff) | |
| download | linux-287638b2c533165c3c03dfa15196c2ba583cd287.tar.xz linux-287638b2c533165c3c03dfa15196c2ba583cd287.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/virtio/virtio_pci.c')
| -rw-r--r-- | drivers/virtio/virtio_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 193c8f0e5cc5..bcec78ffc765 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -669,7 +669,7 @@ static int __init virtio_pci_init(void) err = pci_register_driver(&virtio_pci_driver); if (err) - device_unregister(virtio_pci_root); + root_device_unregister(virtio_pci_root); return err; } |