diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-07 17:50:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 21:54:43 -0700 |
| commit | cc6f3336fa8f8730ec517d2677849ceb256c5b70 (patch) | |
| tree | 9e3e0740f88e35f5352305bbc830239fb7302dcb /drivers | |
| parent | 523c5d8e699bbfb576dc33a12524d0e8ae0bbc78 (diff) | |
staging: comedi: me4000: move struct me4000_info definition
Move the struct me4000_info definition from the header to the c
file. This struct is not used by any other file.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/me4000.c | 7 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/me4000.h | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 4ba0835b137..6247ee3bc6f 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/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/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h index 103a2a4a51c..2478933bdad 100644 --- a/drivers/staging/comedi/drivers/me4000.h +++ b/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 ----------------------------------------------------------------------------*/ |