---

yaml --- r: 337412 b: refs/heads/master c: 3d41c44 h: refs/heads/master v: v3
git-mirror · Oct 30, 2012 · 41f43d2 · 41f43d2
1 parent 3890baf
commit 41f43d2
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 23 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3974c5c08d50fb3a23ec825186a60535264142e8
+refs/heads/master: 3d41c44370a9a1e78e53c9997289347ec97d46ee
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -46,28 +46,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <linux/pci.h>
-#include <linux/gfp.h>
-#include <linux/io.h>
-#include "../../comedidev.h"
-#if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
-#include <asm/i387.h>
-#endif
-#include "../comedi_fc.h"
-
-#include "addi_common.h"
-#include "addi_amcc_s5933.h"
-
 #ifndef ADDIDATA_DRIVER_NAME
 #define ADDIDATA_DRIVER_NAME	"addi_common"
 #endif

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_035.c b/trunk/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_035 1
 
 #define ADDIDATA_WATCHDOG 2	/*  Or shold it be something else */

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_1032 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_1032"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1500.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_1500 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_1500"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_1516 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_1516"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1564.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_1564 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_1564"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_16XX 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_16xx"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -1,3 +1,11 @@
+#include <asm/i387.h>
+
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_1710 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_1710"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2016.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2016.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_2016 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_2016"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_2032 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_2032"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_2200 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_2200"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3001.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3001.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_3001 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_3001"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_3120 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_3120"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -1,3 +1,11 @@
+#include <asm/i387.h>
+
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_3200 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_3200"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3300.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3300.c
@@ -1,3 +1,11 @@
+#include <asm/i387.h>
+
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_3300 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_3300"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_3501 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_3501"

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -1,3 +1,9 @@
+#include "../comedidev.h"
+#include "comedi_fc.h"
+
+#include "addi-data/addi_common.h"
+#include "addi-data/addi_amcc_s5933.h"
+
 #define CONFIG_APCI_3XXX 1
 
 #define ADDIDATA_DRIVER_NAME	"addi_apci_3xxx"