From 4d8cdcfea1396ebfc6499f07a2f25d5a686e88e5 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 16 Mar 2009 22:12:21 -0400
Subject: [PATCH] --- yaml --- r: 141578 b: refs/heads/master c:
 947a33fd2196209a1aa8f00de4068e8a09a19cd9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d4d309feb8ac..8d368538d83c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8961467e60d42c1997fdf783fee4802c9fea8cc
+refs/heads/master: 947a33fd2196209a1aa8f00de4068e8a09a19cd9
diff --git a/trunk/drivers/staging/comedi/drivers/das16.c b/trunk/drivers/staging/comedi/drivers/das16.c
index 0219c32e853c..6b6b042099de 100644
--- a/trunk/drivers/staging/comedi/drivers/das16.c
+++ b/trunk/drivers/staging/comedi/drivers/das16.c
@@ -355,7 +355,7 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
 
 static void reg_dump(struct comedi_device * dev);
 
-typedef struct das16_board_struct {
+struct das16_board {
 	const char *name;
 	void *ai;
 	unsigned int ai_nbits;
@@ -371,9 +371,9 @@ typedef struct das16_board_struct {
 
 	unsigned int size;
 	unsigned int id;
-} das16_board;
+};
 
-static const struct das16_board_struct das16_boards[] = {
+static const struct das16_board das16_boards[] = {
 	{
 	      name:	"das-16",
 	      ai:	das16_ai_rinsn,
@@ -696,7 +696,7 @@ static const struct das16_board_struct das16_boards[] = {
 #endif
 };
 
-#define n_das16_boards ((sizeof(das16_boards))/(sizeof(das16_board)))
+#define n_das16_boards ((sizeof(das16_boards))/(sizeof(struct das16_board)))
 
 static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int das16_detach(struct comedi_device * dev);
@@ -740,7 +740,7 @@ struct das16_private_struct {
 	volatile short timer_mode;	// true if using timer mode
 };
 #define devpriv ((struct das16_private_struct *)(dev->private))
-#define thisboard ((struct das16_board_struct *)(dev->board_ptr))
+#define thisboard ((struct das16_board *)(dev->board_ptr))
 
 static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s,
 	struct comedi_cmd * cmd)