public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	Stefan Seyfried <stefan.seyfried@googlemail.com>,
	Wang YanQing <udknight@gmail.com>
Subject: [ 08/11] Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller"
Date: Thu, 11 Jul 2013 15:11:08 -0700	[thread overview]
Message-ID: <20130711220546.493864099@linuxfoundation.org> (raw)
In-Reply-To: <20130711220545.542911892@linuxfoundation.org>

3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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>

---
 drivers/tty/serial/8250/8250_pci.c |    4 ----
 1 file changed, 4 deletions(-)

--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -4086,10 +4086,6 @@ static struct pci_device_id serial_pci_t
 		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 },



  parent reply	other threads:[~2013-07-11 22:12 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-11 22:11 [ 00/11] 3.4.53-stable review Greg Kroah-Hartman
2013-07-11 22:11 ` [ 01/11] libceph: Fix NULL pointer dereference in auth client code Greg Kroah-Hartman
2013-07-11 22:11 ` [ 02/11] drivers/cdrom/cdrom.c: use kzalloc() for failing hardware Greg Kroah-Hartman
2013-07-11 22:11 ` [ 03/11] charger-manager: Ensure event is not used as format string Greg Kroah-Hartman
2013-07-11 22:11 ` [ 04/11] hpfs: better test for errors Greg Kroah-Hartman
2013-07-11 22:11 ` [ 05/11] block: do not pass disk names as format strings Greg Kroah-Hartman
2013-07-11 22:11 ` [ 06/11] crypto: sanitize argument for format string Greg Kroah-Hartman
2013-07-11 22:11 ` [ 07/11] MAINTAINERS: add stable_kernel_rules.txt to stable maintainer information Greg Kroah-Hartman
2013-07-24  5:09   ` Ben Hutchings
2013-07-24  5:30     ` Greg Kroah-Hartman
2013-07-11 22:11 ` Greg Kroah-Hartman [this message]
2013-07-11 22:11 ` [ 09/11] nfsd4: fix decoding of compounds across page boundaries Greg Kroah-Hartman
2013-07-11 22:11 ` [ 10/11] SCSI: sd: Fix parsing of temporary cache mode prefix Greg Kroah-Hartman
2013-07-11 22:11 ` [ 11/11] Revert "sched: Add missing call to calc_load_exit_idle()" Greg Kroah-Hartman
2013-07-12  0:24 ` [ 00/11] 3.4.53-stable review Paul Gortmaker
2013-07-12  0:33   ` Greg Kroah-Hartman
2013-07-12  2:17     ` Steven Rostedt
2013-07-12 14:58 ` Benjamin LaHaise
2013-07-12 15:08   ` Greg Kroah-Hartman
2013-07-12 17:21 ` Shuah Khan
2013-07-12 17:34 ` Guenter Roeck
2013-07-12 18:38   ` Greg Kroah-Hartman
2013-07-13  4:16 ` Satoru Takeuchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130711220546.493864099@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=stefan.seyfried@googlemail.com \
    --cc=udknight@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox