From: H Hartley Sweeten Date: Fri, 22 Mar 2013 16:52:15 +0000 (-0700) Subject: staging: comedi: ni_labpc: move a couple of the #define's X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=488ec9f12d8b9768798987b4660b82cbb6ed181b;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: ni_labpc: move a couple of the #define's For aesthetic reasons, move a couple of the #defines in this file so that the register map defines are first. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 8791caedd476..159d31d98707 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -82,11 +82,6 @@ #include "comedi_fc.h" #include "ni_labpc.h" -/* size of io region used by board */ -#define LABPC_SIZE 32 -/* 2 MHz master clock */ -#define LABPC_TIMER_BASE 500 - /* * Register map (all registers are 8-bit) */ @@ -157,6 +152,8 @@ #define INTERVAL_COUNT_REG 0x1e /* W: Interval Counter Data reg */ #define INTERVAL_STROBE_REG 0x1f /* W: Interval Counter Strobe reg */ +#define LABPC_SIZE 0x20 /* size of ISA io region */ +#define LABPC_TIMER_BASE 500 /* 2 MHz master clock */ #define LABPC_ADC_TIMEOUT 1000 enum scan_mode {