From 89f4d800fcb843f2a359515d9a3f409d309921aa Mon Sep 17 00:00:00 2001
From: Morgan Gatti <morgan.gatti@gmail.com>
Date: Tue, 11 May 2010 23:55:53 +0200
Subject: [PATCH] --- yaml --- r: 197413 b: refs/heads/master c:
 94c1f90bb0bac8c2b75569a247b89145022c4c24 h: refs/heads/master i:   197411:
 41a499e10da7ecd50b32e17029dbc9cb08683a5e v: v3

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

diff --git a/[refs] b/[refs]
index d9edf589bf60..f1f27de1c783 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6593dfacd3320c4f5fefd6e307ea5c6e9c5dac4f
+refs/heads/master: 94c1f90bb0bac8c2b75569a247b89145022c4c24
diff --git a/trunk/drivers/staging/comedi/drivers/usbdux.c b/trunk/drivers/staging/comedi/drivers/usbdux.c
index 8942ae45708d..df71515c7a30 100644
--- a/trunk/drivers/staging/comedi/drivers/usbdux.c
+++ b/trunk/drivers/staging/comedi/drivers/usbdux.c
@@ -793,7 +793,7 @@ static int usbduxsub_stop(struct usbduxsub *usbduxsub)
 }
 
 static int usbduxsub_upload(struct usbduxsub *usbduxsub,
-			    uint8_t * local_transfer_buffer,
+			    uint8_t *local_transfer_buffer,
 			    unsigned int startAddr, unsigned int len)
 {
 	int errcode;
@@ -825,7 +825,7 @@ static int usbduxsub_upload(struct usbduxsub *usbduxsub,
 #define FIRMWARE_MAX_LEN 0x2000
 
 static int firmwareUpload(struct usbduxsub *usbduxsub,
-			  const u8 * firmwareBinary, int sizeFirmware)
+			  const u8 *firmwareBinary, int sizeFirmware)
 {
 	int ret;
 	uint8_t *fwBuf;
@@ -835,7 +835,7 @@ static int firmwareUpload(struct usbduxsub *usbduxsub,
 
 	if (sizeFirmware > FIRMWARE_MAX_LEN) {
 		dev_err(&usbduxsub->interface->dev,
-			"comedi_: usbdux firmware binary it too large for FX2.\n");
+			"usbdux firmware binary it too large for FX2.\n");
 		return -ENOMEM;
 	}
 
@@ -1264,8 +1264,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 			    (this_usbduxsub->ai_interval) * 2;
 		}
 		this_usbduxsub->ai_timer = cmd->scan_begin_arg / (125000 *
-								  (this_usbduxsub->
-								   ai_interval));
+							  (this_usbduxsub->
+							   ai_interval));
 	} else {
 		/* interval always 1ms */
 		this_usbduxsub->ai_interval = 1;