diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-25 22:41:00 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-25 22:41:00 -0500 |
| commit | 874f2f997dbe041a6c6e509dae8656ed9022d65d (patch) | |
| tree | 61898165882041ef7f9beaf2ef6663a1a4d3c29a /drivers/virtio/virtio_pci.c | |
| parent | 071c06cb570d38efe23a124e885f2f3e643a9206 (diff) | |
| parent | 6ebdc661b608671e9ca572af8bb42d58108cc008 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
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 28d9cf7cf72f..1d5191fab62e 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
| @@ -702,7 +702,7 @@ static struct pci_driver virtio_pci_driver = { | |||
| 702 | .name = "virtio-pci", | 702 | .name = "virtio-pci", |
| 703 | .id_table = virtio_pci_id_table, | 703 | .id_table = virtio_pci_id_table, |
| 704 | .probe = virtio_pci_probe, | 704 | .probe = virtio_pci_probe, |
| 705 | .remove = virtio_pci_remove, | 705 | .remove = __devexit_p(virtio_pci_remove), |
| 706 | #ifdef CONFIG_PM | 706 | #ifdef CONFIG_PM |
| 707 | .suspend = virtio_pci_suspend, | 707 | .suspend = virtio_pci_suspend, |
| 708 | .resume = virtio_pci_resume, | 708 | .resume = virtio_pci_resume, |