Huge monster patch that removes unnessary headers

diff --git a/comedi/comedi_ksyms.c b/comedi/comedi_ksyms.c
index cfb5444fa1f012ee959d0af5daab233b7deb6515..146c0f75182644d780fd5b2ae25bfa1c579167c0 100644 (file)
--- a/comedi/comedi_ksyms.c
+++ b/comedi/comedi_ksyms.c
@@ -22,12 +22,9 @@
 */
 
 
+#define __NO_VERSION__
 #include <linux/comedidev.h>
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-
 
 
 

diff --git a/comedi/drivers/8255.c b/comedi/drivers/8255.c
index 5670367883afe9d00068995351024d78442cb73d..6794100651f048ee148c2569d81ced9842b152d8 100644 (file)
--- a/comedi/drivers/8255.c
+++ b/comedi/drivers/8255.c
@@ -78,20 +78,10 @@ I/O port base address can be found in the output of 'lspci -v'.
    will copy the latched value to a Comedi buffer.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 
 #define _8255_SIZE 4

diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c
index dffdde950e800e5979426f9d183d2c592ad2ac93..12f9e1c28705e31001098c8932e06dde3a744ae6 100644 (file)
--- a/comedi/drivers/adl_pci9111.c
+++ b/comedi/drivers/adl_pci9111.c
@@ -75,20 +75,11 @@ TODO:
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
+
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 
 typedef enum

diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index e87ad89a9fefdce4172323029da7027386062b66..23b6cc6f78f28189f11cdf983c16d07e040e16ca 100644 (file)
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -63,21 +63,10 @@ Configuration options:
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
-//#include <asm/byteorder.h>
 #include <linux/comedidev.h>
+
+#include <linux/delay.h>
+
 #include "amcc_s5933.h"
 #include "8253.h"
 

diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c
index 91309da32fe2e7d1c2c27e56cbbe832b0c9d061f..45c64bdcbc7aad3cba2c29c84f4ffba5acdf26b4 100644 (file)
--- a/comedi/drivers/adv_pci1710.c
+++ b/comedi/drivers/adv_pci1710.c
@@ -41,20 +41,10 @@ Configuration options:
           device will be used.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
+
+#include <linux/pci.h>
+
 #include "8253.h"
 #include "amcc_s5933.h"
 

diff --git a/comedi/drivers/amcc_s5933.c b/comedi/drivers/amcc_s5933.c
index 7766e80656f4180e8a83117e9e452882fe0256b6..5aae1258390886979cd1c39d2e4c620fe89e709b 100644 (file)
--- a/comedi/drivers/amcc_s5933.c
+++ b/comedi/drivers/amcc_s5933.c
@@ -12,11 +12,9 @@
     example.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/comedidev.h>
 
 #include <linux/pci.h>
-#include <linux/comedidev.h>
 
 #include "amcc_s5933.h"
 

diff --git a/comedi/drivers/amcc_s5933.h b/comedi/drivers/amcc_s5933.h
index af898c70d14cf723d73aab90efd69012f2efb5d6..ddf96784b011ceab3bdafcd9eb798ec9c3b72a8e 100644 (file)
--- a/comedi/drivers/amcc_s5933.h
+++ b/comedi/drivers/amcc_s5933.h
@@ -15,8 +15,8 @@
 #ifndef _AMCC_S5933_H_
 #define _AMCC_S5933_H_
 
-#include <linux/pci.h>
 #include <linux/comedidev.h>
+#include <linux/pci.h>
 
 
 /****************************************************************************/

diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c
index f3e9737cd9df7eb47521e10242a30ad05b9fff93..4277ce2a3e4489545cdd33e57cc7036f39eec3dc 100644 (file)
--- a/comedi/drivers/amplc_pc236.c
+++ b/comedi/drivers/amplc_pc236.c
@@ -52,22 +52,10 @@ the IRQ jumper.  If no interrupt is connected, then subdevice 1 is
 unused.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/pci.h>
+
 #include "8255.h"
 #include "plx9052.h"
 

diff --git a/comedi/drivers/amplc_pc263.c b/comedi/drivers/amplc_pc263.c
index c0dfc459e89a7f6c19830e302bb6d49eeba725bc..cfe46a7b0d0a41d459d99ae15af15bc839df52dc 100644 (file)
--- a/comedi/drivers/amplc_pc263.c
+++ b/comedi/drivers/amplc_pc263.c
@@ -44,22 +44,10 @@ connected to a reed-relay. Relay contacts are closed when output is 1.
 The state of the outputs can be read.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/pci.h>
+
 #define PC263_DRIVER_NAME      "amplc_pc263"
 
 /* PCI263 PCI configuration register information */

diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 39afc9c3e1c92def4b2c06a4d75b29de85ab065a..be2b66c502ddb633c34a779d450f3f7ea5f8a51f 100644 (file)
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -31,22 +31,10 @@ Status: unknown
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/comedidev.h>
-#include <linux/pci.h>
-#include <linux/init.h>
 
-#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
 
 #include "8253.h"
 #include "8255.h"

diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c
index ca313cfd70088313e4ffa59f47b2b64b7373b18f..eacb804cd1246444d3f879e8cf54113a1bfcc2ee 100644 (file)
--- a/comedi/drivers/cb_das16_cs.c
+++ b/comedi/drivers/cb_das16_cs.c
@@ -31,21 +31,9 @@ Status: experimental
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <linux/init.h>
 #include <linux/pci.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>

diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index f24baa811ab9623bf165a7b8b0ef72faee46e39e..6a1d13dfb1cd12b853b15fb375e493df2fd76278 100644 (file)
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -78,21 +78,10 @@ TODO:
 analog triggering on 1602 series
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 #include "8255.h"
 #include "amcc_s5933.h"

diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index 3cad80beffecd745492f191f80b8d66fecabbe67..470a339a966921a83a12800543328e49442c4b30 100644 (file)
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -76,21 +76,10 @@ TODO:
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 #include "8255.h"
 #include "plx9080.h"

diff --git a/comedi/drivers/cb_pcidda.c b/comedi/drivers/cb_pcidda.c
index f2c8585030260fa48c1b207ef065e24179ed85ce..3a71661849a81f3f1d2e8055c51b38f4c6001f70 100644 (file)
--- a/comedi/drivers/cb_pcidda.c
+++ b/comedi/drivers/cb_pcidda.c
@@ -46,21 +46,8 @@ Please report sucess/failure with other different cards to
 <comedi@comedi.org>.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
+#include <linux/pci.h>
 
 #include "8255.h"
 

diff --git a/comedi/drivers/cb_pcimdas.c b/comedi/drivers/cb_pcimdas.c
index c500e022c9989169c0fb653a2f4bfb240eabb58f..bfe416caa8860b66c8229d58e434a5cc744cba03 100644 (file)
--- a/comedi/drivers/cb_pcimdas.c
+++ b/comedi/drivers/cb_pcimdas.c
@@ -40,21 +40,10 @@ No interrupts, multi channel or FIFO AI, although the card looks like it could s
 See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more details.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
+
+#include <linux/pci.h>
+
 #include "plx9052.h"
 
 //#define CBPCIMDAS_DEBUG

diff --git a/comedi/drivers/cb_pcimdda.c b/comedi/drivers/cb_pcimdda.c
index aca208e7d1b35abb00a4ba02b41a42650d5034ee..e8b8c944032342194daf4ab6d7e5a43e9fac7df4 100644 (file)
--- a/comedi/drivers/cb_pcimdda.c
+++ b/comedi/drivers/cb_pcimdda.c
@@ -85,21 +85,10 @@ Configuration Options:
     -Calin Culianu <calin@ajvar.org>
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
+
+#include <linux/pci.h>
+
 #include "8255.h"
 
 

diff --git a/comedi/drivers/comedi_fc.c b/comedi/drivers/comedi_fc.c
index 56178119c7805259cfad9c4535603ee01ec34ad0..b85299e9f877de09801338b8cf88e7c28bf95083 100644 (file)
--- a/comedi/drivers/comedi_fc.c
+++ b/comedi/drivers/comedi_fc.c
@@ -24,10 +24,9 @@
 
 ************************************************************************/
 
-#include <linux/module.h>
-#include <linux/kernel.h>
+#include <linux/comedidev.h>
+
 #include "comedi_fc.h"
-#include "linux/comedidev.h"
 
 static inline unsigned int bytes_per_scan( comedi_subdevice *subd )
 {

diff --git a/comedi/drivers/comedi_fc.h b/comedi/drivers/comedi_fc.h
index 3cf3d7b683f1c9e60978f6996361002138859d61..fa041130d3403f78ca5fb8be24b2074627dbd756 100644 (file)
--- a/comedi/drivers/comedi_fc.h
+++ b/comedi/drivers/comedi_fc.h
@@ -26,7 +26,7 @@
 
 ************************************************************************/
 
-#include "linux/comedidev.h"
+#include <linux/comedidev.h>
 
 /* Writes an array of data points to comedi's buffer */
 extern unsigned int cfc_write_array_to_buffer( comedi_subdevice *subd, void *data,

diff --git a/comedi/drivers/comedi_parport.c b/comedi/drivers/comedi_parport.c
index a3873dbce6f19cb2e845f0c52ac5c6ab43e84a72..bb1d8e22e27301c01d0e53eb468d3e09e6942e86 100644 (file)
--- a/comedi/drivers/comedi_parport.c
+++ b/comedi/drivers/comedi_parport.c
@@ -81,19 +81,8 @@ pin, which can be used to wake up tasks.
    or http://www.linux-magazin.de/ausgabe/1999/10/IO/io.html
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
+#include <linux/ioport.h>
 
 
 #define PARPORT_SIZE 3

diff --git a/comedi/drivers/comedi_rt_timer.c b/comedi/drivers/comedi_rt_timer.c
index a832614c1226c030bda7c36c0248df7e3a1ff5e4..d221edab72b11d36eb9f1100ac7d0d98a6f2e872 100644 (file)
--- a/comedi/drivers/comedi_rt_timer.c
+++ b/comedi/drivers/comedi_rt_timer.c
@@ -53,9 +53,6 @@ TODO:
 */
 
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 #include <linux/comedilib.h>
 #ifdef CONFIG_COMEDI_RTL_V1

diff --git a/comedi/drivers/comedi_test.c b/comedi/drivers/comedi_test.c
index 5d879e06f55f9164dd10bfce272b463ad39bc281..4984092cbca2676a1c09c172d27970164aef91a6 100644 (file)
--- a/comedi/drivers/comedi_test.c
+++ b/comedi/drivers/comedi_test.c
@@ -50,18 +50,10 @@ zero volts).
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/time.h>
-#include <linux/init.h>
 #include <linux/comedidev.h>
+
 #include <asm/div64.h>
+
 #include "comedi_fc.h"
 
 /* Board descriptions */

diff --git a/comedi/drivers/contec_pci_dio.c b/comedi/drivers/contec_pci_dio.c
index 01124182a768674fbeef579dd79e1937448dff73..85362c880440d0d752c97bf5b4ff9b89f976d69e 100644 (file)
--- a/comedi/drivers/contec_pci_dio.c
+++ b/comedi/drivers/contec_pci_dio.c
@@ -31,22 +31,10 @@ Configuration Options:
   none
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/pci.h>
+
 typedef enum contec_model {
        PIO1616L        =0,
 } contec_model;

diff --git a/comedi/drivers/daqboard2000.c b/comedi/drivers/daqboard2000.c
index ae11e191b68fdcf9f408d2894bf7e6da6e8b0c73..9828e28b0be318ec2e78dfdcef7b5e7f70f53031 100644 (file)
--- a/comedi/drivers/daqboard2000.c
+++ b/comedi/drivers/daqboard2000.c
@@ -115,22 +115,11 @@ Configuration options:
    
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
+
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <linux/comedidev.h>
+
 #include "8255.h"
 #ifdef CONFIG_COMEDI_DAQBOARD2000_FPGA
 #include "daqboard2000_fpga.h"

diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index 13811ac8148300da4126bc9d5c469b84096426f5..1b871623d102b5f0195e6c5a22720de05b720878 100644 (file)
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -53,17 +53,10 @@ comedi_rt_timer driver can be used to emulate commands for this
 driver.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/comedidev.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
+
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
 
 #include "8255.h"
 

diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c
index a8187660f8ed80ec70920f5b9c8fccd12f2f8c1f..c0f8b72abfaccf511b3f9b7709b0fc88be9aa8c7 100644 (file)
--- a/comedi/drivers/das16.c
+++ b/comedi/drivers/das16.c
@@ -83,16 +83,10 @@ Computer boards manuals also available from their website www.measurementcomputi
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/comedidev.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <asm/io.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
 #include <asm/dma.h>
+
 #include "8253.h"
 #include "8255.h"
 #include "comedi_fc.h"

diff --git a/comedi/drivers/das16m1.c b/comedi/drivers/das16m1.c
index bb8a4985fe63c1472b1430fcef3f10cf2403e881..56488e7189ace7214e366450b1c92577ed4ec59c 100644 (file)
--- a/comedi/drivers/das16m1.c
+++ b/comedi/drivers/das16m1.c
@@ -58,14 +58,9 @@ Options:
 irq can be omitted, although the cmd interface will not work without it.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/comedidev.h>
-#include <linux/errno.h>
 #include <linux/ioport.h>
-#include <asm/io.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
+
 #include "8255.h"
 #include "8253.h"
 #include "comedi_fc.h"

diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index 11dd0d22621bc91e0e4072771066c229825acaa2..a5d16d8eb7fb3695545af4cd99e10ec7fdca5e8d 100644 (file)
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -99,20 +99,11 @@ TODO:
        read insn for analog out
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
 #include <asm/dma.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 #include "comedi_fc.h"
 

diff --git a/comedi/drivers/das6402.c b/comedi/drivers/das6402.c
index 1ae87e24aaf0931c4121e0743c955f834f795493..6dd70607be9fdea1f067e5b9b31abf44cf4db0d6 100644 (file)
--- a/comedi/drivers/das6402.c
+++ b/comedi/drivers/das6402.c
@@ -38,13 +38,9 @@ Devices: [Keithley Metrabyte] DAS6402 (das6402)
 This driver has suffered bitrot.
 */
 
-#include <linux/module.h>
 #include <linux/comedidev.h>
-#include <asm/io.h>
-#include <linux/kernel.h>
+
 #include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/time.h>
 
 #define DAS6402_SIZE 16
 

diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c
index b1980f5604ba4f1d17ef6ea8129b9c03279ace27..35e810ff60151449325c139d5c8f57a3a832f410 100644 (file)
--- a/comedi/drivers/das800.c
+++ b/comedi/drivers/das800.c
@@ -61,19 +61,11 @@ cmd triggers supported:
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 #include "comedi_fc.h"
 

diff --git a/comedi/drivers/dt2801.c b/comedi/drivers/dt2801.c
index e2ca8013178f3d7ef806ce4e462e11d27329711e..be3ca4c06e5edbc87bc815fa9763c88e988cdc90 100644 (file)
--- a/comedi/drivers/dt2801.c
+++ b/comedi/drivers/dt2801.c
@@ -29,10 +29,8 @@ Configuration options:
 */
 
 #include <linux/comedidev.h>
-#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
-#include <asm/io.h>
 
 
 #define DT2801_TIMEOUT 1000

diff --git a/comedi/drivers/dt2811.c b/comedi/drivers/dt2811.c
index 656eadd5872af541e5ff174a35479b914f134a31..948dca7776640ba03e61bb938ffe49926d2a48a6 100644 (file)
--- a/comedi/drivers/dt2811.c
+++ b/comedi/drivers/dt2811.c
@@ -45,20 +45,10 @@ Configuration options:
   [4] - D/A 1 range (same choices)
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 static char *driver_name = "dt2811";
 
 static comedi_lrange range_dt2811_pgh_ai_5_unipolar = { 4, {

diff --git a/comedi/drivers/dt2814.c b/comedi/drivers/dt2814.c
index 36aa270b297cac820eaa7069a47c342eeba69ac3..c7ef753a162eecae097a5a45dc98f789254dcfbe 100644 (file)
--- a/comedi/drivers/dt2814.c
+++ b/comedi/drivers/dt2814.c
@@ -39,21 +39,10 @@ a power of 10, from 1 to 10^7, of which only 3 or 4 are useful.  In
 addition, the clock does not seem to be very accurate.
 */
 
+#include <linux/comedidev.h>
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
-#include <linux/comedidev.h>
-
 
 
 #define DT2814_SIZE 2

diff --git a/comedi/drivers/dt2815.c b/comedi/drivers/dt2815.c
index 2beb1576e396607e1ccaf2716b40e31634bfcdf9..c02ae551cc3d36c346679f8c66fb00324488480d 100644 (file)
--- a/comedi/drivers/dt2815.c
+++ b/comedi/drivers/dt2815.c
@@ -56,19 +56,10 @@ Configuration options:
   [12] - Analog output 7 range configuration (same options)
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
 
 
 static comedi_lrange range_dt2815_ao_32_current = { 1, {

diff --git a/comedi/drivers/dt2817.c b/comedi/drivers/dt2817.c
index 9ea3cd7c6bb7de33370e725dc8045519f02f5311..a0a95613d0a828ef28194798df38329cd872cad9 100644 (file)
--- a/comedi/drivers/dt2817.c
+++ b/comedi/drivers/dt2817.c
@@ -38,20 +38,10 @@ Configuration options:
   [0] - I/O port base base address
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 
 #define DT2817_SIZE 5

diff --git a/comedi/drivers/dt282x.c b/comedi/drivers/dt282x.c
index c4e71ae95a89a27fc7662cd2ce4f4949585ac785..5025933e12f6e4d06ee21f68af56f923dfb16b89 100644 (file)
--- a/comedi/drivers/dt282x.c
+++ b/comedi/drivers/dt282x.c
@@ -54,18 +54,9 @@ Notes:
 */
 
 #include <linux/comedidev.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <asm/dma.h>
 
 #define DEBUG

diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c
index 7598e29244a79b050a0248998ff999b69e1afe89..06e64b31b11444498e9163cbf7bbbaddd6915f25 100644 (file)
--- a/comedi/drivers/dt3000.c
+++ b/comedi/drivers/dt3000.c
@@ -53,12 +53,10 @@ AO commands are not supported.
 #define DEBUG 1
 
 #include <linux/comedidev.h>
-#include <linux/module.h>
+
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/init.h>
 
-#include <asm/io.h>
 
 #define PCI_VENDOR_ID_DT       0x1116
 

diff --git a/comedi/drivers/fl512.c b/comedi/drivers/fl512.c
index d16046cf8460a7f15b92187a282f4e329a703656..7c9e356d1a778062e34d167fddaeb391e7123a49 100644 (file)
--- a/comedi/drivers/fl512.c
+++ b/comedi/drivers/fl512.c
@@ -16,20 +16,11 @@ Configuration options:
   [0] - I/O port base address
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/delay.h>
+#include <linux/ioport.h>
+
 #define FL512_SIZE 16               /* the size of the used memory */
 typedef struct {
   sampl_t ao_readback[2];

diff --git a/comedi/drivers/icp_multi.c b/comedi/drivers/icp_multi.c
index 8c43c9fc8c349262aca6b8cab513ad8d88af274f..a0ad8ddee2b33ae06b4acecc90c24e856d46c59d 100644 (file)
--- a/comedi/drivers/icp_multi.c
+++ b/comedi/drivers/icp_multi.c
@@ -34,20 +34,10 @@ Options:
  [1] - PCI slot number 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
+
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
 
 #include "icp_multi.h"
 

diff --git a/comedi/drivers/icp_multi.h b/comedi/drivers/icp_multi.h
index 6cb2806121900b07f6ca0bad1adeb68fe464bb90..0307aa2babc812fadaa69be9729de7a04170b79e 100644 (file)
--- a/comedi/drivers/icp_multi.h
+++ b/comedi/drivers/icp_multi.h
@@ -10,8 +10,8 @@
 #ifndef _ICP_MULTI_H_
 #define _ICP_MULTI_H_
 
-#include <linux/pci.h>
 #include <linux/comedidev.h>
+#include <linux/pci.h>
 
 
 

diff --git a/comedi/drivers/ii_pci20kc.c b/comedi/drivers/ii_pci20kc.c
index 80ad5e0c7612536b87da756463e785790514cec7..a5bb10de596f12a88930d6f12cf9f9f98902af08 100644 (file)
--- a/comedi/drivers/ii_pci20kc.c
+++ b/comedi/drivers/ii_pci20kc.c
@@ -81,13 +81,6 @@ options for PCI-20341M:
 
 #include <linux/comedidev.h>
 
-#include <linux/module.h>      /* modularer Kernel */
-#include <linux/kernel.h>      /* printk() */
-#include <linux/errno.h>       /* error codes */
-#include <linux/delay.h>       /* udelay() */
-
-#include <asm/io.h>            /* readb() ... */
-
 
 #define PCI20000_ID                    0x1d
 #define PCI20341_ID                            0x77

diff --git a/comedi/drivers/ke_counter.c b/comedi/drivers/ke_counter.c
index e84cade4d14897829e61b12aff1fd8e9d5d45b62..9d6c46cf16e7d3ef604cbc3e9702c31eb923ea5a 100644 (file)
--- a/comedi/drivers/ke_counter.c
+++ b/comedi/drivers/ke_counter.c
@@ -32,22 +32,10 @@ This driver is a simple driver to read the counter values from
 Kolter Electronic PCI Counter Card.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/pci.h>
+
 #define CNT_DRIVER_NAME         "ke_counter"
 #define PCI_VENDOR_ID_KOLTER    0x1001
 #define CNT_CARD_DEVICE_ID      0x0014

diff --git a/comedi/drivers/me_daq.c b/comedi/drivers/me_daq.c
index e43e1c9d439484ea609beeec5493071136f79428..7b3ecaa7489c14e282fc120b5632246219931ae4 100644 (file)
--- a/comedi/drivers/me_daq.c
+++ b/comedi/drivers/me_daq.c
@@ -43,21 +43,10 @@ Configuration options:
     device will be used.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/pci.h>
+
 #include "me2600_fw.h"
 
 #define ME_DRIVER_NAME                 "me_daq"

diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c
index bf92e7da913eba1e51e21f87ff065f7d6f1f7bc1..bddef9c95d56182356d51813e6c8b2405f48c35d 100644 (file)
--- a/comedi/drivers/mite.c
+++ b/comedi/drivers/mite.c
@@ -51,16 +51,8 @@
 //#define USE_KMALLOC
 
 #include <linux/comedidev.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
+
 #include <linux/pci.h>
-#include <asm/io.h>
-#include <linux/slab.h>
 
 #include "mite.h"
 

diff --git a/comedi/drivers/mpc8260cpm.c b/comedi/drivers/mpc8260cpm.c
index 6752504df674b024a6a47501b8b5d3e603fec49d..b88bf56740634ef9c49ae362753a19cd3d1e6f51 100644 (file)
--- a/comedi/drivers/mpc8260cpm.c
+++ b/comedi/drivers/mpc8260cpm.c
@@ -34,18 +34,6 @@ you to access the processor's generic digital I/O lines.
 It is apparently missing some code.
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
 

diff --git a/comedi/drivers/multiq3.c b/comedi/drivers/multiq3.c
index bd0011b63841c39a2d48d08b25cf22aa6234879f..362db58b2fc8d829a2048eaac1e78e48d4981a72 100644 (file)
--- a/comedi/drivers/multiq3.c
+++ b/comedi/drivers/multiq3.c
@@ -29,20 +29,10 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3)
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 #define MULTIQ3_SIZE 16
 

diff --git a/comedi/drivers/ni_670x.c b/comedi/drivers/ni_670x.c
index fcbd178ed2bd56614f70af80e1a65b2fab3ab9be..75a0e1ad65a6e3404fad3fdd31cdd91c8dde9d2c 100644 (file)
--- a/comedi/drivers/ni_670x.c
+++ b/comedi/drivers/ni_670x.c
@@ -38,19 +38,8 @@ Commands are not supported.
        Bart Joris <bjoris@advalvas.be> Last updated on 20/08/2001
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h> 
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-
 #include <linux/comedidev.h>
+
 #include "mite.h"
 
 #define PCI_VENDOR_ID_NATINST  0x1093

diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c
index 6cd12a1faeb8297fef49eae437ba92dd4f85bfe2..d97fd126a28128c905a36fd5a03eaa87a4ba2238 100644 (file)
--- a/comedi/drivers/ni_at_a2150.c
+++ b/comedi/drivers/ni_at_a2150.c
@@ -63,20 +63,11 @@ TRIG_WAKE_EOS
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
 #include <asm/dma.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 #include "comedi_fc.h"
 

diff --git a/comedi/drivers/ni_at_ao.c b/comedi/drivers/ni_at_ao.c
index 8e1f2f8dd71bcfb7a3fa74bacc6e45465c5d559b..711898c0e943e952425690e9aa9819a07a0efb4a 100644 (file)
--- a/comedi/drivers/ni_at_ao.c
+++ b/comedi/drivers/ni_at_ao.c
@@ -36,22 +36,10 @@ This driver has not been tested, but should work.
  * document 320379.pdf.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 /* board egisters */
 /* registers with _2_ are accessed when GRP2WR is set in CFG1 */

diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c
index 05e88762f278a46375b20b950cce8610ef17017f..7da17e6c8b93be2c7560c8e16d8d94d5fbc19260 100644 (file)
--- a/comedi/drivers/ni_atmio.c
+++ b/comedi/drivers/ni_atmio.c
@@ -82,20 +82,14 @@ are not supported.
        
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <asm/io.h>
-#include <linux/slab.h>
 #include <linux/comedidev.h>
+
+#include <linux/delay.h>
 #ifdef HAVE_ISAPNP
-#include <linux/isapnp.h>
-#include <linux/pci.h>
+//#include <linux/isapnp.h>
+//#include <linux/pci.h>
 #endif
+
 #include "ni_stc.h"
 #include "8255.h"
 

diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c
index 2faf093ad47973d8787bd25057baa9ff0a527d55..bb0ec2766d3645f8d73597a6c0856778ddc7a207 100644 (file)
--- a/comedi/drivers/ni_atmio16d.c
+++ b/comedi/drivers/ni_atmio16d.c
@@ -35,19 +35,10 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
  * 
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
+
+#include <linux/ioport.h>
+
 #include "8255.h"
 
 

diff --git a/comedi/drivers/ni_daq_dio24.c b/comedi/drivers/ni_daq_dio24.c
index ec48de1b05b3fe29fdd6095beb8d4d7a50a7755d..ae8d8b9e6487a6bd1bbaae1d7da1a8e8d14de024 100644 (file)
--- a/comedi/drivers/ni_daq_dio24.c
+++ b/comedi/drivers/ni_daq_dio24.c
@@ -40,26 +40,11 @@ the PCMCIA interface.
 //#define LABPC_DEBUG  // enable debugging messages
 #undef LABPC_DEBUG
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
-#include "8255.h"
 
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <asm/system.h>
+#include <linux/ioport.h>
+
+#include "8255.h"
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index eefda827b2807970eb98d6a2c3cfeaa0be059d2a..7a628c14ca750ff66460c4b39e929dc13d064422 100644 (file)
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -70,21 +70,11 @@ NI manuals:
 #undef LABPC_DEBUG
 //#define LABPC_DEBUG  // enable debugging messages
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
+
+#include <linux/delay.h>
 #include <asm/dma.h>
+
 #include "8253.h"
 #include "8255.h"
 #include "mite.h"
@@ -92,14 +82,6 @@ NI manuals:
 
 #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
 
-//#include <pcmcia/config.h>
-//#include <pcmcia/k_compat.h>
-
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <asm/system.h>
-
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index b84f732754165c53a1ac0350f593f8d509cd9cfc..146d2e39d88d61860fdecf2811d5fe09f2f3033f 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -56,8 +56,6 @@
 //#define DEBUG_STATUS_A
 //#define DEBUG_STATUS_B
 
-#include <linux/irq.h>
-
 #include "8255.h"
 #include "mite.h"
 

diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index a3532da0cc8c6c36a1cc5b4a43b77962db178866..9f907b1edf51b8d29f97b4afd85efd72852d2b0d 100644 (file)
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -41,19 +41,10 @@ See the notes in the ni_atmio.o driver.
        
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <asm/io.h>
-#include <linux/slab.h>
-#ifdef CONFIG_COMEDI_RTL
-#include <linux/rtl.h>
-#endif
 #include <linux/comedidev.h>
+
+#include <linux/delay.h>
+
 #include "ni_stc.h"
 #include "8255.h"
 

diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index 86e9299664fd0845b525625dbce100810103a6e7..288f22b09a42f5a5d47f1155f1cb34d10ec0bbd9 100644 (file)
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -64,17 +64,10 @@ AT-MIO96.
 #define DEBUG 1
 #define DEBUG_FLAGS
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/comedidev.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
+
+#include <linux/irq.h> /* for disable_irq */
+
 #include "mite.h"
 #include "8255.h"
 

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 538b57423bd13172eab9a5e6acd8cfde878204f3..13b8efcd633aa5115c9010e7010f779d333d638a 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -93,18 +93,9 @@ Bugs:
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/comedidev.h>
-#include <linux/init.h>
 
-#include <asm/io.h>
+#include <linux/delay.h>
 
 #include "ni_stc.h"
 #include "mite.h"

diff --git a/comedi/drivers/pcl711.c b/comedi/drivers/pcl711.c
index 818fd63bd2842bf51fb83c944eb3dd3d2d58174e..9c934736ef614dbce6503a189e560e01e9f73b48 100644 (file)
--- a/comedi/drivers/pcl711.c
+++ b/comedi/drivers/pcl711.c
@@ -58,19 +58,11 @@ supported.
 
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 
 

diff --git a/comedi/drivers/pcl724.c b/comedi/drivers/pcl724.c
index 2f20109909f830fb82034c85083a7b63f85deb95..b28bc1ee7bff590cf6513c50dc592b515fd73841 100644 (file)
--- a/comedi/drivers/pcl724.c
+++ b/comedi/drivers/pcl724.c
@@ -39,19 +39,11 @@ See the source for configuration details.
  *   comedi_insn
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
-#include <linux/comedidev.h>
+
 #include "8255.h"
 
 #define PCL722_SIZE    32

diff --git a/comedi/drivers/pcl725.c b/comedi/drivers/pcl725.c
index 416e7c784b08992b84fe57c7d92c6b43bf42f028..3575aa96b6ae3253e17b94d6a589ddb82854e970 100644 (file)
--- a/comedi/drivers/pcl725.c
+++ b/comedi/drivers/pcl725.c
@@ -10,20 +10,10 @@ Status: unknown
 Devices: [Advantech] PCL-725 (pcl725)
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 
 #define PCL725_SIZE 2

diff --git a/comedi/drivers/pcl726.c b/comedi/drivers/pcl726.c
index fa610caa51a7607c23c4508e4d8dcca80e977db6..6bb7811ae0adf8aed701b4e9578bf9ed68af501b 100644 (file)
--- a/comedi/drivers/pcl726.c
+++ b/comedi/drivers/pcl726.c
@@ -67,20 +67,10 @@ Interrupts are not supported.
     their web page.  (http://www.cir.com/)
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 #undef ACL6126_IRQ     /* no interrupt support (yet) */
 

diff --git a/comedi/drivers/pcl812.c b/comedi/drivers/pcl812.c
index 6ec624989e0d965f47f434f3a0f2e26595ac41d8..d6391f17522ce87a899e1194d9bf26c5f6856c5a 100644 (file)
--- a/comedi/drivers/pcl812.c
+++ b/comedi/drivers/pcl812.c
@@ -110,20 +110,12 @@ See the head of the source file pcl812.c for configuration options.
  *     
  */
 
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
+
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
-#include <asm/io.h>
+#include <linux/ioport.h>
 #include <asm/dma.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 
 

diff --git a/comedi/drivers/pcl816.c b/comedi/drivers/pcl816.c
index 1056aa89979548a5126d07e7483fff9308cfdad1..8da634f423ac6d2806e693825662e04881699029 100644 (file)
--- a/comedi/drivers/pcl816.c
+++ b/comedi/drivers/pcl816.c
@@ -34,12 +34,13 @@ Configuration Options:
 
 #define DEBUG(x) x
 
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
-#include <linux/module.h>
 #include <linux/mc146818rtc.h>
 #include <linux/delay.h>
 #include <asm/dma.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 
 

diff --git a/comedi/drivers/pcl818.c b/comedi/drivers/pcl818.c
index 08ccd1590f513580313ea39e949eab9f365a42f7..8ce26613375aea9374586dbbc794c4cb17d2b81e 100644 (file)
--- a/comedi/drivers/pcl818.c
+++ b/comedi/drivers/pcl818.c
@@ -98,12 +98,13 @@ A word or two about DMA. Driver support DMA operations at two ways:
 
 */
 
+#include <linux/comedidev.h>
+
 #include <linux/ioport.h>
-#include <linux/module.h>
 #include <linux/mc146818rtc.h>
 #include <linux/delay.h>
 #include <asm/dma.h>
-#include <linux/comedidev.h>
+
 #include "8253.h"
 
 // #define PCL818_MODE13_AO 1

diff --git a/comedi/drivers/pcm3730.c b/comedi/drivers/pcm3730.c
index 2a37442180aed3c2c73290ee8f047cab5eb23221..9a0370501b65bbd3ffacf86754f6af3ab7a6a2f4 100644 (file)
--- a/comedi/drivers/pcm3730.c
+++ b/comedi/drivers/pcm3730.c
@@ -14,20 +14,10 @@ Configuration options:
   [0] - I/O port base
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 
 #define PCM3730_SIZE 4   // consecutive io port addresses

diff --git a/comedi/drivers/pcmad.c b/comedi/drivers/pcmad.c
index 4c7d22f4739b1f8d92e22164c944c12287fcca22..abe5b6caa7f2b974c1413fdea670ca9aac248055 100644 (file)
--- a/comedi/drivers/pcmad.c
+++ b/comedi/drivers/pcmad.c
@@ -42,19 +42,9 @@ Configuration options:
 */
 
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/comedidev.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 
 
 #define PCMAD_SIZE             4

diff --git a/comedi/drivers/poc.c b/comedi/drivers/poc.c
index 1bc52fa5513bf27cc1f6b9e5cfd6f90200789d0d..c3ee262f9e509e0f33a8392c1ec090c57aa2cce0 100644 (file)
--- a/comedi/drivers/poc.c
+++ b/comedi/drivers/poc.c
@@ -38,20 +38,10 @@ Configuration options:
   [0] - I/O port base
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 static int poc_attach(comedi_device *dev,comedi_devconfig *it);
 static int poc_detach(comedi_device *dev);
 static int readback_insn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);

diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c
index 899179a644501491184cddb57c9e3ef01368a588..556df5af69f11a43d4afe2513880f5c96c674a43 100644 (file)
--- a/comedi/drivers/quatech_daqp_cs.c
+++ b/comedi/drivers/quatech_daqp_cs.c
@@ -35,19 +35,7 @@ Status: unkown
 Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 */
 
-//#include <pcmcia/config.h>
-//#include <pcmcia/k_compat.h>
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <asm/io.h>
-#include <asm/system.h>
+#include <linux/comedidev.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -56,7 +44,6 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 
-#include <linux/comedidev.h>
 
 /*
    All the PCMCIA modules use PCMCIA_DEBUG to control debugging.  If

diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c
index 33a50eff022a6c8b6dfce143ac02156475aa87fe..df3154044180d5f0c8b93db89f2e7ae8bb4c30e0 100644 (file)
--- a/comedi/drivers/rtd520.c
+++ b/comedi/drivers/rtd520.c
@@ -101,23 +101,11 @@ Configuration options:
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
+#include <linux/comedidev.h>
+
 #include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/timex.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-#include <linux/init.h>
 
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <linux/comedidev.h>
 
 
 /*======================================================================
@@ -1036,7 +1024,7 @@ static int rtd_attach (
     return 1;
 
     /* hit an error, clean up memory and return ret */
-rtd_attach_die_error:
+//rtd_attach_die_error:
 #ifdef USE_DMA
     for(index = 0; index < DMA_CHAIN_COUNT; index++) {
        if (NULL != devpriv->dma0Buff[index]) { /* free buffer memory*/

diff --git a/comedi/drivers/rti800.c b/comedi/drivers/rti800.c
index c5d162073297486af03837b796ec6375e3e79a9f..6db094033463530c17e52ab011906fe9d198701b 100644 (file)
--- a/comedi/drivers/rti800.c
+++ b/comedi/drivers/rti800.c
@@ -51,20 +51,10 @@ Configuration options:
   [7] - DAC 1 encoding (same as DAC 0)
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 #define RTI800_SIZE 16
 

diff --git a/comedi/drivers/rti802.c b/comedi/drivers/rti802.c
index 684b2e62a9f0d0b8241b8ff61b95f15e6b8b7ea9..34fd615caa91868a3c8ae7ae890c4c2b82905346 100644 (file)
--- a/comedi/drivers/rti802.c
+++ b/comedi/drivers/rti802.c
@@ -37,20 +37,10 @@ Configuration Options:
     [17] - dac#7 ...
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/ioport.h>
+
 
 #define RTI802_SIZE 4
 

diff --git a/comedi/drivers/serial2002.c b/comedi/drivers/serial2002.c
index 009c7b21cdab6745f0777bee3849f04343780f33..b1ec5eb750b2a7a5aa2916acab60e1f9b898b7a1 100644 (file)
--- a/comedi/drivers/serial2002.c
+++ b/comedi/drivers/serial2002.c
@@ -31,22 +31,11 @@ Status: in development
 
 */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/malloc.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 <asm/io.h>
-#include <asm/uaccess.h>
-#include <linux/serial.h>
 #include <linux/comedidev.h>
 
+#include <linux/delay.h>
+#include <linux/ioport.h>
+
 
 /*
  * Board descriptions for two imaginary boards.  Describing the

diff --git a/comedi/drivers/skel.c b/comedi/drivers/skel.c
index 8f6ebc7cef8985de5a204bb35496ab5303ce79ae..c0458a4f4376344ebef8e3f5a08aa1328be7b689 100644 (file)
--- a/comedi/drivers/skel.c
+++ b/comedi/drivers/skel.c
@@ -72,22 +72,10 @@ Configuration Options:
  * options that are used with comedi_config.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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/init.h>
-#include <linux/pci.h>
-#include <asm/io.h>
 #include <linux/comedidev.h>
 
+#include <linux/pci.h> /* for PCI devices */
+
 
 /* Imaginary registers for the imaginary board */
 

diff --git a/comedi/drivers/ssv_dnp.c b/comedi/drivers/ssv_dnp.c
index 4d5b8735b8c170c14bf96a3038494c4655444f45..5a155d49b8607c84c030d797ff3cad8fb4fc6944 100644 (file)
--- a/comedi/drivers/ssv_dnp.c
+++ b/comedi/drivers/ssv_dnp.c
@@ -31,18 +31,6 @@ Status: unknown
 
 /* include files ----------------------------------------------------------- */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/slab.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 <asm/io.h>
 #include <linux/comedidev.h>
 
 

diff --git a/comedi/kcomedilib/get.c b/comedi/kcomedilib/get.c
index 62f2b00050e53463faff87ae1145c0d5a886944f..4a93d5fad8bf5677d1c57bb228d78b0dd25671a5 100644 (file)
--- a/comedi/kcomedilib/get.c
+++ b/comedi/kcomedilib/get.c
@@ -21,7 +21,7 @@
 
 */
 
-
+#define __NO_VERSION__
 #include <linux/comedidev.h>
 #include <linux/comedi.h>
 #include <linux/comedilib.h>

diff --git a/comedi/proc.c b/comedi/proc.c
index a3410d4040d593384e799684780241822995d205..8c53af036b9023931bd9a391d1c443d18e7f92fa 100644 (file)
--- a/comedi/proc.c
+++ b/comedi/proc.c
@@ -29,9 +29,10 @@
 */
 
 
+#define __NO_VERSION__
 #include <linux/comedidev.h>
 #include <linux/proc_fs.h>
-#include <linux/string.h>
+//#include <linux/string.h>
 
 
 #if LINUX_VERSION_CODE < 0x020100

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index 1fbdbd0ad30c17ecfe5a9d0a14716c44a37df9e6..a4fe7668e14fedc2465a105e73218bf1069faddf 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -24,6 +24,8 @@
 #ifndef _COMEDIDEV_H
 #define _COMEDIDEV_H
 
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/version.h>
 #include <linux/config.h>
 #include <linux/kdev_t.h>
@@ -35,7 +37,9 @@
 #include <linux/init.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
+
 #include <asm/uaccess.h>
+#include <asm/io.h>
 
 #include <linux/comedi.h>
 

diff --git a/scripts/check_driver b/scripts/check_driver
index 0edb5589ae7b745f44bd3647ddad5a971bf7fe1d..acc1120ffece328d149e7bcd28ef6b58a21cd31f 100755 (executable)
--- a/scripts/check_driver
+++ b/scripts/check_driver
@@ -403,3 +403,18 @@ if grep 'COMEDI_SUBD_AI' ${driver} &>/dev/null;then
        fi
 fi
 
+if grep -e 'include..linux.version.h' \
+        -e 'include..linux.config.h' \
+        -e 'include..linux.kdev_t.h' \
+        -e 'include..linux.slab.h' \
+        -e 'include..linux.errno.h' \
+        -e 'include..linux.spinlock.h' \
+        -e 'include..linux.wait.h' \
+        -e 'include..linux.mm.h' \
+        -e 'include..linux.init.h' \
+        -e 'include..linux.vmalloc.h' \
+        -e 'include..asm.uaccess.h' \
+       ${driver} &>/dev/null;then
+       echo "W: Driver #includes headers included by comedidev.h"
+fi
+