From f89c84c8c3c55d153ecddb8b271d30fdbd30fa05 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 12 Sep 2012 15:39:48 -0700
Subject: [PATCH] --- yaml --- r: 325255 b: refs/heads/master c:
 606b04707e39cfc109273e8047c2b5600e407327 h: refs/heads/master i:   325253:
 63be149a4fd7ec38d008eecfb1492a5dce004f2d   325251:
 b3a6e5d95f3a51ba8ba74b089f11d707db6c0287   325247:
 2806517d2c7d97c6e88357aebf7afb1a32bb9e03 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/comedi/Kconfig            | 3 ++-
 trunk/drivers/staging/comedi/drivers/8255_pci.c | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 818ebf005df2..7e374a09758f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1a3f87967a2eaadf22936b30c05a7427d78db8
+refs/heads/master: 606b04707e39cfc109273e8047c2b5600e407327
diff --git a/trunk/drivers/staging/comedi/Kconfig b/trunk/drivers/staging/comedi/Kconfig
index 1bd7e93fa80c..3f67b98f7558 100644
--- a/trunk/drivers/staging/comedi/Kconfig
+++ b/trunk/drivers/staging/comedi/Kconfig
@@ -558,7 +558,8 @@ config COMEDI_8255_PCI
 
 	  Supported boards:
 	    ADlink - PCI-7224, PCI-7248, and PCI-7296
-	    Measurement Computing - PCI-DIO24, PCI-DIO24H and PCI-DIO48H
+	    Measurement Computing - PCI-DIO24, PCI-DIO24H, PCI-DIO48H and
+	                            PCI-DIO96H
 
 	  To compile this driver as a module, choose M here: the module will
 	  be called 8255_pci.
diff --git a/trunk/drivers/staging/comedi/drivers/8255_pci.c b/trunk/drivers/staging/comedi/drivers/8255_pci.c
index e011b0ae9294..075f98bd257e 100644
--- a/trunk/drivers/staging/comedi/drivers/8255_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/8255_pci.c
@@ -34,6 +34,7 @@ Devices: (ADLink) PCI-7224 [adl_pci-7224] - 24 channels
 	 (Measurement Computing) PCI-DIO24 [cb_pci-dio24] - 24 channels
 	 (Measurement Computing) PCI-DIO24H [cb_pci-dio24h] - 24 channels
 	 (Measurement Computing) PCI-DIO48H [cb_pci-dio48h] - 48 channels
+	 (Measurement Computing) PCI-DIO96H [cb_pci-dio96h] - 96 channels
 Author: H Hartley Sweeten <hsweeten@visionengravers.com>
 Updated: Wed, 12 Sep 2012 11:52:01 -0700
 Status: untested
@@ -62,6 +63,7 @@ Configuration Options: not applicable, uses PCI auto config
 
 #define PCI_DEVICE_ID_CB_PCIDIO48H	0x000b
 #define PCI_DEVICE_ID_CB_PCIDIO24H	0x0014
+#define PCI_DEVICE_ID_CB_PCIDIO96H	0x0017
 #define PCI_DEVICE_ID_CB_PCIDIO24	0x0028
 
 struct pci_8255_boardinfo {
@@ -102,6 +104,11 @@ static const struct pci_8255_boardinfo pci_8255_boards[] = {
 		.device		= PCI_DEVICE_ID_CB_PCIDIO48H,
 		.dio_badr	= 1,
 		.n_8255		= 2,
+	}, {
+		.name		= "cb_pci-dio96h",
+		.device		= PCI_DEVICE_ID_CB_PCIDIO96H,
+		.dio_badr	= 2,
+		.n_8255		= 4,
 	},
 };
 
@@ -206,6 +213,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO24) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO24H) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO48H) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO96H) },
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, pci_8255_pci_table);