Commit 474ae561 authored by steven@brudenell.name's avatar steven@brudenell.name Committed by Linus Torvalds

[PATCH] parport_pc: partially revert netmos patch

There's a conflict between parport_pc and parport_serial.  parport_pc is
claiming the 9735 and 9835 devices, but parport_pc wants to handle them.  So
remove support for those devices from parport_pc.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a78a8388
......@@ -2736,8 +2736,6 @@ enum parport_pc_pci_cards {
netmos_9805,
netmos_9815,
netmos_9855,
netmos_9735,
netmos_9835,
netmos_9755,
netmos_9715
};
......@@ -2813,8 +2811,6 @@ static struct parport_pc_pci {
/* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */
/* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
/* netmos_9855 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
/* netmos_9735 */ { 1, { { 2, 3 }, } }, /* untested */
/* netmos_9835 */ { 1, { { 2, 3 }, } }, /* untested */
/* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
/* netmos_9715 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
};
......@@ -2895,10 +2891,6 @@ static struct pci_device_id parport_pc_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9755,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9755 },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9715,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment