summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2013-11-27 17:43:43 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-06 11:08:15 -0800
commitd35b93d05eb82babe49fd76a68b94d803f2ed19a (patch)
treebd3cea1876562223df0625ce35f0cd2094f53bbc /drivers/pinctrl
parentcca90a970d9b18e56fb53dbcec448ba2b641170c (diff)
downloadlinux-stable-d35b93d05eb82babe49fd76a68b94d803f2ed19a.tar.gz
linux-stable-d35b93d05eb82babe49fd76a68b94d803f2ed19a.tar.bz2
linux-stable-d35b93d05eb82babe49fd76a68b94d803f2ed19a.zip
parport: parport_pc: remove double PCI ID for NetMos
commit d6a484520c5572a4170fa915109ccfc0c38f5008 upstream. In commit 85747f ("PATCH] parport: add NetMOS 9805 support") Max added the PCI ID for NetMOS 9805 based on a Debian bug report from 2k4 which was at the v2.4.26 time frame. The patch made into 2.6.14. Shortly before that patch akpm merged commit 296d3c783b ("[PATCH] Support NetMOS based PCI cards providing serial and parallel ports") which made into v2.6.9-rc1. Now we have two different entries for the same PCI id. I have here the NetMos 9805 which claims to support SPP/EPP/ECP mode. This patch takes Max's entry for titan_1284p1 (base != -1 specifies the ioport for ECP mode) and replaces akpm's entry for netmos_9805 which specified -1 (=none). Both share the same PCI-ID (my card has subsystem 0x1000 / 0x0020 so it should match PCI_ANY). While here I also drop the entry for titan_1284p2 which is the same as netmos_9815. Cc: Maximilian Attems <maks@stro.at> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl')
0 files changed, 0 insertions, 0 deletions