This patch add new sub-device-id to support new adapter and changed the
interrupt irq number for unsigned char to unsigned int.

Signed-off by: Wendy Xiong <[EMAIL PROTECTED]>


diff -Nuar linux-2.6.21-rc7.orig/drivers/serial/icom.c 
linux-2.6.21-rc7.new/drivers/serial/icom.c
--- linux-2.6.21-rc7.orig/drivers/serial/icom.c 2008-01-10 23:53:59.000000000 
-0600
+++ linux-2.6.21-rc7.new/drivers/serial/icom.c  2008-01-10 23:58:30.000000000 
-0600
@@ -97,6 +97,13 @@
              .subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,
              .driver_data = ADAPTER_V2,
         },
+       {
+             .vendor = PCI_VENDOR_ID_IBM,
+             .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+             .subvendor = PCI_VENDOR_ID_IBM,
+             .subdevice = 
PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE,
+             .driver_data = ADAPTER_V2,
+        },
        {}
 };

diff -Nuar linux-2.6.21-rc7.orig/drivers/serial/icom.h 
linux-2.6.21-rc7.new/drivers/serial/icom.h
--- linux-2.6.21-rc7.orig/drivers/serial/icom.h 2008-01-10 23:53:59.000000000 
-0600
+++ linux-2.6.21-rc7.new/drivers/serial/icom.h  2008-01-10 23:55:42.000000000 
-0600
@@ -258,7 +258,7 @@
 struct icom_adapter {
        void __iomem * base_addr;
        unsigned long base_addr_pci;
-       unsigned char irq_number;
+       unsigned int irq_number;
        struct pci_dev *pci_dev;
        struct icom_port port_info[4];
        int index;
diff -Nuar linux-2.6.21-rc7.orig/include/linux/pci_ids.h 
linux-2.6.21-rc7.new/include/linux/pci_ids.h
--- linux-2.6.21-rc7.orig/include/linux/pci_ids.h       2008-01-10 
23:54:13.000000000 -0600
+++ linux-2.6.21-rc7.new/include/linux/pci_ids.h        2008-01-10 
23:59:08.000000000 -0600
@@ -471,6 +471,7 @@
 #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2        0x0219
 #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX                0x021A
 #define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM    0x0251
+#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE       0x0361
 #define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to