diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-30 09:03:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-13 11:42:26 -0700 |
| commit | 94b86558ab7109fa41e18d33ca510c0bc17b6cba (patch) | |
| tree | 3c982eb19c682e20b47e7b1094541d15ca2f9de1 | |
| parent | e0896b461ff2761c7a36d223f33d4f6d52c7340f (diff) | |
| download | linux-3.10-94b86558ab7109fa41e18d33ca510c0bc17b6cba.tar.gz linux-3.10-94b86558ab7109fa41e18d33ca510c0bc17b6cba.tar.bz2 linux-3.10-94b86558ab7109fa41e18d33ca510c0bc17b6cba.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>
| -rw-r--r-- | drivers/tty/serial/8250/8250_pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 26e3a97ab15..c52948b368d 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -4797,10 +4797,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 }, |