mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 04:15:02 +00:00
d35b93d05e
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>
|
||
|---|---|---|
| .. | ||
| BUGS-parport | ||
| daisy.c | ||
| ieee1284.c | ||
| ieee1284_ops.c | ||
| Kconfig | ||
| Makefile | ||
| multiface.h | ||
| parport_amiga.c | ||
| parport_atari.c | ||
| parport_ax88796.c | ||
| parport_cs.c | ||
| parport_gsc.c | ||
| parport_gsc.h | ||
| parport_ip32.c | ||
| parport_mfc3.c | ||
| parport_pc.c | ||
| parport_serial.c | ||
| parport_sunbpp.c | ||
| probe.c | ||
| procfs.c | ||
| share.c | ||
| TODO-parport | ||