From dd4aa98f3ec9f7783c0a2d7eaec65aaa32c30056 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:50:19 -0700
Subject: [PATCH] --- yaml --- r: 324977 b: refs/heads/master c:
 cc6f3336fa8f8730ec517d2677849ceb256c5b70 h: refs/heads/master i:   324975:
 677788acd5a32fc2ddef0f5b3a70b92b1419022d v: v3

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

diff --git a/[refs] b/[refs]
index c834efac61b3..dbc802ea77ed 100644
--- 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
index 4ba0835b137f..6247ee3bc6f5 100644
--- 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
index 103a2a4a51c7..2478933bdad2 100644
--- 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
  ----------------------------------------------------------------------------*/