From: H Hartley Sweeten Date: Wed, 23 Jan 2013 19:43:55 +0000 (-0700) Subject: staging: comedi: addi_apci_3501: reorder code a bit X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=53b28a23532f203f4b8287fad2461886088a9158;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: addi_apci_3501: reorder code a bit Move the private struct definition and the #include of the low-level support code to prepare for merging the code in hwdrv_apci3501.c into the driver. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c index 6207622467a6..a7527a2fe4f0 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -13,15 +13,6 @@ #define APCI3501_DO_REG 0x40 #define APCI3501_DI_REG 0x50 -struct apci3501_private { - int i_IobaseAmcc; - struct task_struct *tsk_Current; - unsigned char b_TimerSelectMode; - unsigned char b_InterruptMode; -}; - -#include "addi-data/hwdrv_apci3501.c" - /* * AMCC S5933 NVRAM */ @@ -42,6 +33,15 @@ struct apci3501_private { #define EEPROM_WATCHDOG 5 #define EEPROM_TIMER_WATCHDOG_COUNTER 10 +struct apci3501_private { + int i_IobaseAmcc; + struct task_struct *tsk_Current; + unsigned char b_TimerSelectMode; + unsigned char b_InterruptMode; +}; + +#include "addi-data/hwdrv_apci3501.c" + static int apci3501_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn,