diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-03 14:20:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-03 14:20:17 +1100 |
| commit | 0b318a476884787dbdda40cf9fcb0c44f0a00502 (patch) | |
| tree | 7604265858644538a8de0779de9df495dba5c461 /drivers | |
| parent | e5451370ad621213ff14a8d11ab1dff7171f45b4 (diff) | |
| parent | ec4537a7d64fddf0e2a20ccb1b6b57333682a114 (diff) | |
Merge remote-tracking branch 'vhost/linux-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/pci/ngene/ngene-cards.c | 7 | ||||
| -rw-r--r-- | drivers/virtio/virtio_mmio.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c index 423e8c889310..8438c1c8acde 100644 --- a/drivers/media/pci/ngene/ngene-cards.c +++ b/drivers/media/pci/ngene/ngene-cards.c @@ -781,12 +781,6 @@ static pci_ers_result_t ngene_error_detected(struct pci_dev *dev, return PCI_ERS_RESULT_CAN_RECOVER; } -static pci_ers_result_t ngene_link_reset(struct pci_dev *dev) -{ - printk(KERN_INFO DEVICE_NAME ": link reset\n"); - return 0; -} - static pci_ers_result_t ngene_slot_reset(struct pci_dev *dev) { printk(KERN_INFO DEVICE_NAME ": slot reset\n"); @@ -800,7 +794,6 @@ static void ngene_resume(struct pci_dev *dev) static const struct pci_error_handlers ngene_errors = { .error_detected = ngene_error_detected, - .link_reset = ngene_link_reset, .slot_reset = ngene_slot_reset, .resume = ngene_resume, }; diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index c71fde5fe835..08357d70a891 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -70,7 +70,7 @@ #include <linux/spinlock.h> #include <linux/virtio.h> #include <linux/virtio_config.h> -#include <linux/virtio_mmio.h> +#include <uapi/linux/virtio_mmio.h> #include <linux/virtio_ring.h> |