aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-11-03 06:41:34 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2014-11-03 06:41:34 -0500
commitbc79a3179a1da387d730af81ce857d481915efdb (patch)
tree614ab630f05af73a86460ce128d32f31d991c186
parent0df1f2487d2f0d04703f142813d53615d62a1da4 (diff)
parentf7ceb0dfec43d2d4e2373d02968f8fb58c6858f7 (diff)
Merge tag 'kvm-s390-20141103' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
Fix a build warning in virtio-ccw introduced during the merge window.
-rw-r--r--drivers/s390/kvm/virtio_ccw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 6cbe6ef3c889..bda52f18e967 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
888 struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev); 888 struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
889 int i; 889 int i;
890 struct virtqueue *vq; 890 struct virtqueue *vq;
891 struct virtio_driver *drv;
892 891
893 if (!vcdev) 892 if (!vcdev)
894 return; 893 return;