diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-30 09:03:06 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-07-27 05:34:24 +0100 |
| commit | 577048c57f84b181bbaf48c3e26e401b6a6a46a9 (patch) | |
| tree | 0231ce73c5b85cfe2be5a07ed573877bc1596071 /drivers/tty | |
| parent | bfac32e77c3581a894d9e752390c93d3e1d1c5b9 (diff) | |
| download | linux-stable-577048c57f84b181bbaf48c3e26e401b6a6a46a9.tar.gz linux-stable-577048c57f84b181bbaf48c3e26e401b6a6a46a9.tar.bz2 linux-stable-577048c57f84b181bbaf48c3e26e401b6a6a46a9.zip | |
Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller"
commit 828c6a102b1f2b8583fadc0e779c46b31d448f0b upstream.
This reverts commit 8d2f8cd424ca0b99001f3ff4f5db87c4e525f366.
As reported by Stefan, this device already works with the parport_serial
driver, so the 8250_pci driver should not also try to grab it as well.
Reported-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
Cc: Wang YanQing <udknight@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250_pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c index 698625696a55..6c9bcdfdc9c6 100644 --- a/drivers/tty/serial/8250_pci.c +++ b/drivers/tty/serial/8250_pci.c @@ -4083,10 +4083,6 @@ static struct pci_device_id serial_pci_tbl[] = { PCI_VENDOR_ID_IBM, 0x0299, 0, 0, pbn_b0_bt_2_115200 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, - 0x1000, 0x0012, - 0, 0, pbn_b0_bt_2_115200 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901, 0xA000, 0x1000, 0, 0, pbn_b0_1_115200 }, |