Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / uio / uio_netx.c

diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c
index 5ffdb483b0157a0c3998ae5cb8c1c0a316bb627a..a879fd5741f849f31fc417a0457cabb38049d1d3 100644 (file)
--- a/drivers/uio/uio_netx.c
+++ b/drivers/uio/uio_netx.c
@@ -18,6 +18,9 @@
 
 #define PCI_VENDOR_ID_HILSCHER         0x15CF
 #define PCI_DEVICE_ID_HILSCHER_NETX    0x0000
+#define PCI_DEVICE_ID_HILSCHER_NETPLC  0x0010
+#define PCI_SUBDEVICE_ID_NETPLC_RAM    0x0000
+#define PCI_SUBDEVICE_ID_NETPLC_FLASH  0x0001
 #define PCI_SUBDEVICE_ID_NXSB_PCA      0x3235
 #define PCI_SUBDEVICE_ID_NXPCA         0x3335
 
@@ -66,6 +69,10 @@ static int __devinit netx_pci_probe(struct pci_dev *dev,
                bar = 0;
                info->name = "netx";
                break;
+       case PCI_DEVICE_ID_HILSCHER_NETPLC:
+               bar = 0;
+               info->name = "netplc";
+               break;
        default:
                bar = 2;
                info->name = "netx_plx";
@@ -133,6 +140,18 @@ static struct pci_device_id netx_pci_ids[] = {
                .subvendor =    0,
                .subdevice =    0,
        },
+       {
+               .vendor =       PCI_VENDOR_ID_HILSCHER,
+               .device =       PCI_DEVICE_ID_HILSCHER_NETPLC,
+               .subvendor =    PCI_VENDOR_ID_HILSCHER,
+               .subdevice =    PCI_SUBDEVICE_ID_NETPLC_RAM,
+       },
+       {
+               .vendor =       PCI_VENDOR_ID_HILSCHER,
+               .device =       PCI_DEVICE_ID_HILSCHER_NETPLC,
+               .subvendor =    PCI_VENDOR_ID_HILSCHER,
+               .subdevice =    PCI_SUBDEVICE_ID_NETPLC_FLASH,
+       },
        {
                .vendor =       PCI_VENDOR_ID_PLX,
                .device =       PCI_DEVICE_ID_PLX_9030,