diff --git a/[refs] b/[refs]
index 918d2a987040..c834efac61b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83eef17c7845d08eb40e5792ed40b387eb555bdd
+refs/heads/master: 523c5d8e699bbfb576dc33a12524d0e8ae0bbc78
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
index 7feb574eb718..103a2a4a51c7 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.h
+++ b/trunk/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