---

yaml --- r: 324977 b: refs/heads/master c: cc6f333 h: refs/heads/master i: 324975: 677788a v: v3
git-mirror · Sep 8, 2012 · dd4aa98 · dd4aa98
1 parent d048f0a
commit dd4aa98
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 523c5d8e699bbfb576dc33a12524d0e8ae0bbc78
+refs/heads/master: cc6f3336fa8f8730ec517d2677849ceb256c5b70
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -75,6 +75,13 @@ broken.
 #define PCI_DEVICE_ID_MEILHAUS_ME4680S	0x4682
 #define PCI_DEVICE_ID_MEILHAUS_ME4680IS	0x4683
 
+struct me4000_info {
+	unsigned long plx_regbase;
+	unsigned long timer_regbase;
+
+	unsigned int ao_readback[4];
+};
+
 struct me4000_board {
 	const char *name;
 	unsigned short device_id;

diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -204,17 +204,6 @@
 #define ME4000_DIO_CTRL_BIT_FIFO_HIGH_2		0x1000
 #define ME4000_DIO_CTRL_BIT_FIFO_HIGH_3		0x2000
 
-/*=============================================================================
-  Global board and subdevice information structures
-  ===========================================================================*/
-
-struct me4000_info {
-	unsigned long plx_regbase;	/*  PLX configuration space base address */
-	unsigned long timer_regbase;	/*  Base address of the timer circuit */
-
-	unsigned int ao_readback[4];
-};
-
 /*-----------------------------------------------------------------------------
   Defines for analog input
  ----------------------------------------------------------------------------*/