Sebastian Andrzej Siewior 28a02c0eef parport: parport_pc: remove double PCI ID for NetMos ... commit d6a484520c 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>		2014-02-06 11:05:47 -08:00
..
BUGS-parport
daisy.c
ieee1284.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ieee1284_ops.c
Kconfig	Fix common misspellings	2011-03-31 11:26:23 -03:00
Makefile
multiface.h
parport_amiga.c
parport_atari.c
parport_ax88796.c	parport: convert drivers/parport/* to use module_platform_driver()	2011-11-30 20:11:46 +09:00
parport_cs.c	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
parport_gsc.c
parport_gsc.h
parport_ip32.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
parport_mfc3.c	treewide: Fix typos in various parts of the kernel, and fix some comments.	2011-12-02 14:57:31 +01:00
parport_pc.c	parport: parport_pc: remove double PCI ID for NetMos	2014-02-06 11:05:47 -08:00
parport_serial.c	parport/serial: add support for Timedia/SUNIX cards to parport_serial	2011-06-07 09:35:57 -07:00
parport_sunbpp.c	parport: convert drivers/parport/* to use module_platform_driver()	2011-11-30 20:11:46 +09:00
probe.c
procfs.c
share.c	parport: make lockdep happy with waitlist_lock	2011-01-26 10:49:59 +10:00
TODO-parport