From 34b72d83d24c5779e603fa121bad6252309e39d0 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 16 Mar 2009 22:11:27 -0400
Subject: [PATCH] --- yaml --- r: 141663 b: refs/heads/master c:
 b90c76fd78a101835eb1cc17271d008ed51688d3 h: refs/heads/master i:   141661:
 9d043e8587a0cace1095d548cdf31778d289b5a2   141659:
 357112b6a43ec13225164060a3d7cac46393d49f   141655:
 83244ed200aafe7fd2a45a99cf65b18ef73f1791   141647:
 192471163ea9a0f005cbae5c34e8c27044fff751   141631:
 414aaed9f9d0f58a267c48c101faab5eb3e7ea1b v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/comedi/drivers/cb_pcimdas.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e86f0af62cdc..539b52a1c35a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 502dd07999b48994dc3c86a0c44f1a684299d44f
+refs/heads/master: b90c76fd78a101835eb1cc17271d008ed51688d3
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
index 3c78c42b7f41..af705fa092c0 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -139,7 +139,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
 /* this structure is for data unique to this hardware driver.  If
    several hardware drivers keep similar information in this structure,
    feel free to suggest moving the variable to the struct comedi_device struct.  */
-typedef struct {
+struct cb_pcimdas_private {
 	int data;
 
 	// would be useful for a PCI device
@@ -161,13 +161,13 @@ typedef struct {
 	unsigned short int port_c;	// copy of BADR4+2
 	unsigned short int dio_mode;	// copy of BADR4+3
 
-} cb_pcimdas_private;
+};
 
 /*
  * most drivers define the following macro to make it easy to
  * access the private structure.
  */
-#define devpriv ((cb_pcimdas_private *)dev->private)
+#define devpriv ((struct cb_pcimdas_private *)dev->private)
 
 /*
  * The struct comedi_driver structure tells the Comedi core module
@@ -209,7 +209,7 @@ static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig
 /*
  * Allocate the private structure area.
  */
-	if (alloc_private(dev, sizeof(cb_pcimdas_private)) < 0)
+	if (alloc_private(dev, sizeof(struct cb_pcimdas_private)) < 0)
 		return -ENOMEM;
 
 /*