git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 828c6a102b1f2b8583fadc0e779c46b31d448f0b Mon Sep 17 00:00:00 2001
   2 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   3 Date: Sun, 30 Jun 2013 09:03:06 -0700
   4 Subject: Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller"
   5
   6 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   7
   8 commit 828c6a102b1f2b8583fadc0e779c46b31d448f0b upstream.
   9
  10 This reverts commit 8d2f8cd424ca0b99001f3ff4f5db87c4e525f366.
  11
  12 As reported by Stefan, this device already works with the parport_serial
  13 driver, so the 8250_pci driver should not also try to grab it as well.
  14
  15 Reported-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
  16 Cc: Wang YanQing <udknight@gmail.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  drivers/tty/serial/8250/8250_pci.c |    4 ----
  21  1 file changed, 4 deletions(-)
  22
  23 --- a/drivers/tty/serial/8250/8250_pci.c
  24 +++ b/drivers/tty/serial/8250/8250_pci.c
  25 @@ -4797,10 +4797,6 @@ static struct pci_device_id serial_pci_t
  26                 PCI_VENDOR_ID_IBM, 0x0299,
  27                 0, 0, pbn_b0_bt_2_115200 },
  28
  29 -       {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
  30 -               0x1000, 0x0012,
  31 -               0, 0, pbn_b0_bt_2_115200 },
  32 -
  33         {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,
  34                 0xA000, 0x1000,
  35                 0, 0, pbn_b0_1_115200 },