From: H Hartley Sweeten Date: Sat, 8 Sep 2012 00:50:01 +0000 (-0700) Subject: staging: comedi: me4000: remove ME4000_CNT_* defines X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=523c5d8e699bbfb576dc33a12524d0e8ae0bbc78;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: comedi: me4000: remove ME4000_CNT_* defines Since this driver is using the 8253.h helpers, these defines are no longer needed. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h index 7feb574eb718..103a2a4a51c7 100644 --- a/drivers/staging/comedi/drivers/me4000.h +++ b/drivers/staging/comedi/drivers/me4000.h @@ -70,15 +70,6 @@ #define ME4000_AO_DEMUX_ADJUST_VALUE 0x4C -/*============================================================================= - Counter base register offsets - ===========================================================================*/ - -#define ME4000_CNT_COUNTER_0_REG 0x00 -#define ME4000_CNT_COUNTER_1_REG 0x01 -#define ME4000_CNT_COUNTER_2_REG 0x02 -#define ME4000_CNT_CTRL_REG 0x03 - /*============================================================================= PLX base register offsets ===========================================================================*/ @@ -248,19 +239,4 @@ struct me4000_info { #define ME4000_AI_LIST_LAST_ENTRY 0x100 -/*----------------------------------------------------------------------------- - Defines for counters - ----------------------------------------------------------------------------*/ - -#define ME4000_CNT_COUNTER_0 0x00 -#define ME4000_CNT_COUNTER_1 0x40 -#define ME4000_CNT_COUNTER_2 0x80 - -#define ME4000_CNT_MODE_0 0x00 /* Change state if zero crossing */ -#define ME4000_CNT_MODE_1 0x02 /* Retriggerable One-Shot */ -#define ME4000_CNT_MODE_2 0x04 /* Asymmetrical divider */ -#define ME4000_CNT_MODE_3 0x06 /* Symmetrical divider */ -#define ME4000_CNT_MODE_4 0x08 /* Counter start by software trigger */ -#define ME4000_CNT_MODE_5 0x0A /* Counter start by hardware trigger */ - #endif