summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-09-07 17:40:59 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-07 21:45:27 -0700
commit06b60981aa66cf5373a3fdcf2e3395db690874f6 (patch)
treefa6f07dc2a18cc3b6f84308d11b714e3b617d2cc
parent8407593ac3961d2da7ebc01541a993ed0dc6d029 (diff)
staging: comedi: me4000: move struct me4000_board definition
Move the struct me4000_board definition from the header to the c file. It's not used by any other source. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/me4000.c13
-rw-r--r--drivers/staging/comedi/drivers/me4000.h17
2 files changed, 13 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index a3d91361acaf..0eb39264d06d 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/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/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index b2cfecbcdf6a..6a92c15fc90a 100644
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -253,23 +253,6 @@
#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
===========================================================================*/