From: H Hartley Sweeten Date: Sat, 8 Sep 2012 00:50:19 +0000 (-0700) Subject: staging: comedi: me4000: move struct me4000_info definition X-Git-Tag: firefly_0821_release~3680^2~1977^2~518 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cc6f3336fa8f8730ec517d2677849ceb256c5b70;p=firefly-linux-kernel-4.4.55.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 4ba0835b137f..6247ee3bc6f5 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 103a2a4a51c7..2478933bdad2 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 ----------------------------------------------------------------------------*/