diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-03 12:41:34 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-03 12:41:34 +0100 |
| commit | bc79a3179a1da387d730af81ce857d481915efdb (patch) | |
| tree | 614ab630f05af73a86460ce128d32f31d991c186 | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | f7ceb0dfec43d2d4e2373d02968f8fb58c6858f7 (diff) | |
| download | op-kernel-dev-bc79a3179a1da387d730af81ce857d481915efdb.zip op-kernel-dev-bc79a3179a1da387d730af81ce857d481915efdb.tar.gz | |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index 6cbe6ef..bda52f1 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, struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev); int i; struct virtqueue *vq; - struct virtio_driver *drv; if (!vcdev) return; |
