- obsolete (already in sources)

Changed files:
    linux-2.4.19-netmos_pci_parallel_n_serial.patch -> 1.3

diff --git a/linux-2.4.19-netmos_pci_parallel_n_serial.patch b/linux-2.4.19-netmos_pci_parallel_n_serial.patch
deleted file mode 100644 (file)
index bc332c6..0000000
--- a/linux-2.4.19-netmos_pci_parallel_n_serial.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-2001-10-11  Tim Waugh  <twaugh@redhat.com>
-
-       * include/linux/pci_ids.h: NetMos PCI IDs.
-       * drivers/parport/parport_pc.c: Support NetMos cards.
-       * drivers/parport/parport_serial.c: Support NetMos cards.
-       * drivers/parport/ChangeLog: Updated.
-
---- linux/include/linux/pci_ids.h.netmos       Fri Mar  1 11:05:36 2002
-+++ linux/include/linux/pci_ids.h      Fri Mar  1 11:05:46 2002
-@@ -1743,8 +1743,12 @@
- #define PCI_DEVICE_ID_HOLTEK_6565     0x6565
- 
- #define PCI_VENDOR_ID_NETMOS          0x9710
-+#define PCI_DEVICE_ID_NETMOS_9705     0x9705
- #define PCI_DEVICE_ID_NETMOS_9735     0x9735
-+#define PCI_DEVICE_ID_NETMOS_9805     0x9805
-+#define PCI_DEVICE_ID_NETMOS_9815     0x9815
- #define PCI_DEVICE_ID_NETMOS_9835     0x9835
-+#define PCI_DEVICE_ID_NETMOS_9855     0x9855
- 
- #define PCI_SUBVENDOR_ID_EXSYS                0xd84d
- #define PCI_SUBDEVICE_ID_EXSYS_4014   0x4014
---- linux/drivers/parport/parport_pc.c.netmos  Fri Mar  1 11:04:15 2002
-+++ linux/drivers/parport/parport_pc.c Fri Mar  1 11:05:46 2002
-@@ -2706,6 +2706,10 @@
-       oxsemi_840,
-       aks_0100,
-       mobility_pp,
-+      netmos_9705,
-+      netmos_9805,
-+      netmos_9815,
-+      netmos_9855,
- };
- 
- 
-@@ -2789,6 +2793,10 @@
-       /* oxsemi_840 */                { 1, { { 0, -1 }, } },
-       /* aks_0100 */                  { 1, { { 0, 1 }, } },
-       /* mobility_pp */               { 1, { { 0, 1 }, } },
-+      /* netmos_9705 */               { 1, { { 0, -1 }, } }, /* untested */
-+      /* netmos_9805 */               { 1, { { 0, -1 }, } }, /* untested */
-+      /* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
-+      /* netmos_9855 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
- };
- 
- static struct pci_device_id parport_pc_pci_tbl[] __devinitdata = {
-@@ -2886,6 +2894,15 @@
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 },
-       { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 },
-+      /* NetMos communication controllers */
-+      { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705,
-+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 },
-+      { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805,
-+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 },
-+      { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815,
-+        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 },
-       { 0, } /* terminate list */
- };
- MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl);
---- linux/drivers/parport/parport_serial.c.netmos      Fri Mar  1 11:05:36 2002
-+++ linux/drivers/parport/parport_serial.c     Fri Mar  1 11:05:46 2002
-@@ -32,6 +32,8 @@
- enum parport_pc_pci_cards {
-       titan_110l = 0,
-       titan_210l,
-+      netmos_9735,
-+      netmos_9835,
-       avlab_1s1p,
-       avlab_1s1p_650,
-       avlab_1s1p_850,
-@@ -66,6 +68,8 @@
- } cards[] __devinitdata = {
-       /* titan_110l */                { 1, { { 3, -1 }, } },
-       /* titan_210l */                { 1, { { 3, -1 }, } },
-+      /* netmos_9735 (not tested) */  { 1, { { 2, -1 }, } },
-+      /* netmos_9835 (not tested) */  { 1, { { 2, -1 }, } },
-       /* avlab_1s1p     */            { 1, { { 1, 2}, } },
-       /* avlab_1s1p_650 */            { 1, { { 1, 2}, } },
-       /* avlab_1s1p_850 */            { 1, { { 1, 2}, } },
-@@ -84,6 +88,10 @@
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l },
-       { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l },
-+      { 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_AVLAB/Intek21 has another bunch of cards ...*/
-       { 0x14db, 0x2110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p},
-       { 0x14db, 0x2111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p_650},
-@@ -124,6 +132,8 @@
- 
- /* titan_110l */      { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 1, 921600 },
- /* titan_210l */      { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 },
-+/* netmos_9735 (n/t)*/        { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
-+/* netmos_9835 (n/t)*/        { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
- /* avlab_1s1p (n/t) */        { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
- /* avlab_1s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
- /* avlab_1s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 1, 115200 },
---- linux/drivers/parport/ChangeLog.netmos     Fri Mar  1 11:05:40 2002
-+++ linux/drivers/parport/ChangeLog    Fri Mar  1 11:05:46 2002
-@@ -0,0 +1,5 @@
-+2001-10-11  Tim Waugh  <twaugh@redhat.com>
-+
-+      * parport_pc.c, parport_serial.c: Support for NetMos cards.
-+      Patch originally from Michael Reinelt <reinelt@eunet.at>.
-+