---

yaml --- r: 324948 b: refs/heads/master c: 06b6098 h: refs/heads/master v: v3
git-mirror · Sep 8, 2012 · 7c686b7 · 7c686b7
1 parent 51414ad
commit 7c686b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8407593ac3961d2da7ebc01541a993ed0dc6d029
+refs/heads/master: 06b60981aa66cf5373a3fdcf2e3395db690874f6
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -64,6 +64,19 @@ broken.
 #include "me4000_fw.h"
 #endif
 
+struct me4000_board {
+	const char *name;
+	unsigned short device_id;
+	int ao_nchan;
+	int ao_fifo;
+	int ai_nchan;
+	int ai_diff_nchan;
+	int ai_sh_nchan;
+	int ex_trig_analog;
+	int dio_nchan;
+	int has_counter;
+};
+
 static const struct me4000_board me4000_boards[] = {
 	{
 		.name		= "ME-4650",

diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -252,23 +252,6 @@
 #define ME4000_DIO_CTRL_BIT_FIFO_HIGH_2		0x1000
 #define ME4000_DIO_CTRL_BIT_FIFO_HIGH_3		0x2000
 
-/*=============================================================================
-  Information about the hardware capabilities
-  ===========================================================================*/
-
-struct me4000_board {
-	const char *name;
-	unsigned short device_id;
-	int ao_nchan;
-	int ao_fifo;
-	int ai_nchan;
-	int ai_diff_nchan;
-	int ai_sh_nchan;
-	int ex_trig_analog;
-	int dio_nchan;
-	int has_counter;
-};
-
 /*=============================================================================
   Global board and subdevice information structures
   ===========================================================================*/