From 071c305eb6dfc42a37ac45d95e95751e12fb8ce4 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 16 Mar 2009 22:12:48 -0400
Subject: [PATCH] --- yaml --- r: 141583 b: refs/heads/master c:
 cdc14cd0ea064b4838f63073ebf5cd2fdf13f309 h: refs/heads/master i:   141581:
 6135144c2697cc008e05df308b85f2ffb12973db   141579:
 57be8baa08c4f1bdf8fe7f5a60a425625c8fea0c   141575:
 4efb1754d3bc516069d2547312a23709a11be640   141567:
 314dd180f9e9f20e95c4d79586ef45145192008b v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/comedi/drivers/jr3_pci.c |  2 +-
 trunk/drivers/staging/comedi/drivers/jr3_pci.h | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e853e441f070..485a4754d523 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2deee55e66d0de60ca28703da5aba8bdaf27b4ba
+refs/heads/master: cdc14cd0ea064b4838f63073ebf5cd2fdf13f309
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index bb0e499d8b83..75867c95b49d 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -644,7 +644,7 @@ static poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s)
 					printk("state_jr3_init_set_full_scale_complete complete = %d\n", is_complete(channel));
 					result = poll_delay_min_max(20, 100);
 				} else {
-					volatile force_array_t *full_scale;
+					volatile struct force_array *full_scale;
 
 					// Use ranges in kN or we will overflow arount 2000N!
 					full_scale = &channel->full_scale;
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.h b/trunk/drivers/staging/comedi/drivers/jr3_pci.h
index 43d1411417a4..06c32f507197 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.h
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.h
@@ -50,7 +50,7 @@ struct raw_channel {
 /* The force_array structure shows the layout for the decoupled and
  * filtered force data.
  */
-typedef struct force_array {
+struct force_array {
 	s32 fx;
 	s32 fy;
 	s32 fz;
@@ -59,7 +59,7 @@ typedef struct force_array {
 	s32 mz;
 	s32 v1;
 	s32 v2;
-} force_array_t;
+};
 
 /* The six_axis_array structure shows the layout for the offsets and
  * the full scales.
@@ -375,7 +375,7 @@ typedef struct force_sensor_data {
 	 * axes used for each vector respectively.
 	 */
 
-	force_array_t full_scale;	/* offset 0x0080 */
+	struct force_array full_scale;	/* offset 0x0080 */
 
 	/* Offsets contains the sensor offsets. These values are subtracted from
 	 * the sensor data to obtain the decoupled data. The offsets are set a
@@ -432,7 +432,7 @@ typedef struct force_sensor_data {
 	 * calculated is specified by the variable rate_address (pg. 12).
 	 */
 
-	force_array_t rate_data;	/* offset 0x00c8 */
+	struct force_array rate_data;	/* offset 0x00c8 */
 
 	/* Minimum_data & maximum_data are the minimum and maximum (peak)
 	 * data values. The JR3 DSP can monitor any 8 contiguous data items
@@ -446,8 +446,8 @@ typedef struct force_sensor_data {
 	 * also lost when plugging in a new sensor.
 	 */
 
-	force_array_t minimum_data;	/* offset 0x00d0 */
-	force_array_t maximum_data;	/* offset 0x00d8 */
+	struct force_array minimum_data;	/* offset 0x00d0 */
+	struct force_array maximum_data;	/* offset 0x00d8 */
 
 	/* Near_sat_value & sat_value contain the value used to determine if
 	 * the raw sensor is saturated. Because of decoupling and offset