From c4e404ce50c1e8d6af21fdc65fdc0d77614a0d1a Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 19 Mar 2009 17:59:07 -0400
Subject: [PATCH] --- yaml --- r: 141687 b: refs/heads/master c:
 b3be94eade6d07270e2a89599f99d42bbcfd6e84 h: refs/heads/master i:   141685:
 e92bf1110e9528f961cceb76678bce3dab59f482   141683:
 eca61ee3113306adf80c732ffbcea19c7a7ab9d6   141679:
 7de26ac919daaa8e125a85efbe42d80d90ee012e v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/comedi/drivers/ni_660x.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fa704bcf1c8b..1e166a79edce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50792813130b94a64e34b89cd2cbfddeb85b7518
+refs/heads/master: b3be94eade6d07270e2a89599f99d42bbcfd6e84
diff --git a/trunk/drivers/staging/comedi/drivers/ni_660x.c b/trunk/drivers/staging/comedi/drivers/ni_660x.c
index dabafa641e7e..14e35ba721e9 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_660x.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_660x.c
@@ -421,7 +421,7 @@ static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, ni_660x_pci_table);
 
-typedef struct {
+struct ni_660x_private {
 	struct mite_struct *mite;
 	struct ni_gpct_device *counter_dev;
 	uint64_t pfi_direction_bits;
@@ -431,9 +431,9 @@ typedef struct {
 	unsigned dma_configuration_soft_copies[NI_660X_MAX_NUM_CHIPS];
 	spinlock_t soft_reg_copy_lock;
 	unsigned short pfi_output_selects[NUM_PFI_CHANNELS];
-} ni_660x_private;
+};
 
-static inline ni_660x_private *private(struct comedi_device * dev)
+static inline struct ni_660x_private *private(struct comedi_device * dev)
 {
 	return dev->private;
 }
@@ -765,7 +765,7 @@ static unsigned ni_gpct_read_register(struct ni_gpct *counter,
 		ni_660x_register);
 }
 
-static inline struct mite_dma_descriptor_ring *mite_ring(ni_660x_private * priv,
+static inline struct mite_dma_descriptor_ring *mite_ring(struct ni_660x_private * priv,
 	struct ni_gpct *counter)
 {
 	return priv->mite_rings[counter->chip_index][counter->counter_index];
@@ -943,7 +943,7 @@ static int ni_660x_allocate_private(struct comedi_device * dev)
 	int retval;
 	unsigned i;
 
-	if ((retval = alloc_private(dev, sizeof(ni_660x_private))) < 0)
+	if ((retval = alloc_private(dev, sizeof(struct ni_660x_private))) < 0)
 		return retval;
 	spin_lock_init(&private(dev)->mite_channel_lock);
 	spin_lock_init(&private(dev)->soft_reg_copy_lock);