diff --git a/[refs] b/[refs]
index b856f24b137a..1eff21bd0a07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e595e926fa892902eff3e189caa6fe5a21e5c69d
+refs/heads/master: ce114dc0227df6fad77764bf19e50a0e5de20a04
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
index c892d0c569e5..be0c6adbdc94 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
@@ -49,13 +49,11 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_SINGLE			0
+#define APCI1710_CONTINUOUS		1
 
-#include "APCI1710_Inp_cpt.h"
+#define APCI1710_PULSEENCODER_READ	0
+#define APCI1710_PULSEENCODER_WRITE	1
 
 /*
 +----------------------------------------------------------------------------+
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
deleted file mode 100644
index c8b90b4103f3..000000000000
--- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *	ADDI-DATA GmbH
- *	Dieselstrasse 3
- *	D-77833 Ottersweier
- *	Tel: +19(0)7223/9493-0
- *	Fax: +49(0)7223/9493-92
- *	http://www.addi-data.com
- *	info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_SINGLE			0
-#define APCI1710_CONTINUOUS		1
-
-#define APCI1710_PULSEENCODER_READ	0
-#define APCI1710_PULSEENCODER_WRITE	1