diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-10 19:12:02 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-10 19:12:02 +0200 |
| commit | 93ea927eb15b736fa4a431f789b1097318129d2a (patch) | |
| tree | b141a0e06c9d1616dc7f0c616a96655afd32f8b0 /drivers/char | |
| parent | arch/tile: add hypervisor-based character driver for SPI flash ROM (diff) | |
| parent | Linux 3.0-rc2 (diff) | |
| download | linux-93ea927eb15b736fa4a431f789b1097318129d2a.tar.xz linux-93ea927eb15b736fa4a431f789b1097318129d2a.zip | |
Merge tag 'v3.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/virtio_console.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 838568a7dbf5..fb68b1295373 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1677,17 +1677,12 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) portdev->config.max_nr_ports = 1; if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT)) { multiport = true; - vdev->features[0] |= 1 << VIRTIO_CONSOLE_F_MULTIPORT; - vdev->config->get(vdev, offsetof(struct virtio_console_config, max_nr_ports), &portdev->config.max_nr_ports, sizeof(portdev->config.max_nr_ports)); } - /* Let the Host know we support multiple ports.*/ - vdev->config->finalize_features(vdev); - err = init_vqs(portdev); if (err < 0) { dev_err(&vdev->dev, "Error %d initializing vqs\n", err); |