From bbc88c1d8622e2ebb1953b401f6828a64ba62181 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 30 Oct 2012 17:00:07 -0700
Subject: [PATCH] --- yaml --- r: 337503 b: refs/heads/master c:
 b629be25caba04c6ec57ee79dca99ba23ffd9a61 h: refs/heads/master i:   337501:
 dac37804deda92561cc0f3fe34ece2aa161b0bf3   337499:
 6b9189e60785cc0d201f19a5ad654c9e41f94bb9   337495:
 ae6dc2306f847de46debe2244b2a06d628856564   337487:
 c32e393c51063ced821a4f60b34dcbc61e2f8ba9   337471:
 3f8fce72355745270a1af10ff3a68975978b34de v: v3

---
 [refs]                                        |  2 +-
 .../comedi/drivers/addi-data/APCI1710_Tor.c   | 21 ++++++++----
 .../comedi/drivers/addi-data/APCI1710_Tor.h   | 33 -------------------
 3 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h

diff --git a/[refs] b/[refs]
index a5b27ebea806..6ef795aae739 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcea74fe31d838e2320160a741d9c135f6934368
+refs/heads/master: b629be25caba04c6ec57ee79dca99ba23ffd9a61
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 3594a0487f70..3bc9826ce40b 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -52,13 +52,22 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
+#define APCI1710_30MHZ			30
+#define APCI1710_33MHZ			33
+#define APCI1710_40MHZ			40
+
+#define APCI1710_GATE_INPUT		10
+
+#define APCI1710_TOR_SIMPLE_MODE	2
+#define APCI1710_TOR_DOUBLE_MODE	3
+#define APCI1710_TOR_QUADRUPLE_MODE	4
+
+#define APCI1710_SINGLE			0
+#define APCI1710_CONTINUOUS		1
 
-#include "APCI1710_Tor.h"
+#define APCI1710_TOR_GETPROGRESSSTATUS	0
+#define APCI1710_TOR_GETCOUNTERVALUE	1
+#define APCI1710_TOR_READINTERRUPT	2
 
 /*
 +----------------------------------------------------------------------------+
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
deleted file mode 100644
index c6eb9d1ad3cc..000000000000
--- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+++ /dev/null
@@ -1,33 +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_30MHZ		30
-#define APCI1710_33MHZ		33
-#define APCI1710_40MHZ		40
-
-#define APCI1710_GATE_INPUT	10
-
-#define APCI1710_TOR_SIMPLE_MODE	2
-#define APCI1710_TOR_DOUBLE_MODE	3
-#define APCI1710_TOR_QUADRUPLE_MODE	4
-
-#define APCI1710_SINGLE			0
-#define APCI1710_CONTINUOUS		1
-
-#define APCI1710_TOR_GETPROGRESSSTATUS	0
-#define APCI1710_TOR_GETCOUNTERVALUE	1
-#define APCI1710_TOR_READINTERRUPT	2