[PATCH] janitor: cleanup includes (drivers/char)

From: Randy Hron <rwhron@earthlink.net>

Cleanup of version.h in drivers/char plus a few in include/linux
that are used in drivers/char.

Duplicate #includes removed.

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 1f7854968967e233bac36454e8b820b78c6d8616..bc506dbff14223af6ceba6c4ce58418fbc165f4a 100644 (file)
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -32,7 +32,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/version.h>
 
 #undef SERIAL_PARANOIA_CHECK
 #define SERIAL_DO_RESTART

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 401e040ed0b0177a7dedbcddbcfd593a881ca0c5..c23803cc47149254b959b2a043bb0c5dc8e517fd 100644 (file)
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -670,7 +670,6 @@ static char rcsid[] =
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/version.h>
 
 #include <linux/stat.h>
 #include <linux/proc_fs.h>

diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index cfd6527bc514661c5d0771ccfd5351210c6f2774..40e67cfe206688a3e35bbcc183a084746d6930e9 100644 (file)
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -24,7 +24,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/slab.h>        /* for kmalloc() and kfree() */
 #include <linux/sched.h>       /* for struct wait_queue etc */
 #include <linux/major.h>

diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 748c8a17295ab7ce15b68dfc9a4a05997e317486..8febd413fd58962cc627a1f41067f51d2f7e49aa 100644 (file)
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -48,7 +48,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 
 #define KERNEL
 #include <linux/types.h>

diff --git a/drivers/char/dz.c b/drivers/char/dz.c
index fb9eab99bf20ec922116893990c6e2d05a96a032..2d9328e24e80699fc333fc86b333ca786099463c 100644 (file)
--- a/drivers/char/dz.c
+++ b/drivers/char/dz.c
@@ -23,7 +23,6 @@ Qua Jun 27 15:02:26 BRT 2001
 
 /* #define DEBUG_DZ 1 */
 
-#include <linux/version.h>
 #include <linux/module.h>
 
 #include <linux/config.h>

diff --git a/drivers/char/ftape/compressor/zftape-compress.c b/drivers/char/ftape/compressor/zftape-compress.c
index 37c8fbaf247b758b0f4b9086851c46b57246fbc7..d27eb620d1affabeb2b81daa9a01c1bdaf7a069e 100644 (file)
--- a/drivers/char/ftape/compressor/zftape-compress.c
+++ b/drivers/char/ftape/compressor/zftape-compress.c
@@ -31,6 +31,7 @@
  char zftc_rev[] = "$Revision: 1.1.6.1 $";
  char zftc_dat[] = "$Date: 1997/11/16 15:15:56 $";
 
+#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/module.h>

diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c
index 869192f67504b648406701c938542f92c6f147be..a41a8e31917e81354f4faa17d21d4d31fe64473e 100644 (file)
--- a/drivers/char/ftape/lowlevel/fdc-io.c
+++ b/drivers/char/ftape/lowlevel/fdc-io.c
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/ioport.h>
-#include <linux/version.h>
 #include <linux/interrupt.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index e35a7a2453acef1866e4e6f71d94707f8df9219d..577950510521c3a9e9793b9a3ae39c26ea88ff8a 100644 (file)
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>

diff --git a/drivers/char/ip2/i2os.h b/drivers/char/ip2/i2os.h
index 92d0d63d755d51604006c320d3a3fcb33bdf1e7d..eff9b542d699d33b92d0774f5208bdff2d8546e7 100644 (file)
--- a/drivers/char/ip2/i2os.h
+++ b/drivers/char/ip2/i2os.h
@@ -25,7 +25,6 @@
 
 #include "ip2types.h"
 #include <asm/io.h>  /* For inb, etc */
-#include <linux/version.h>
 
 //------------------------------------
 // Defines for I/O instructions:

diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index eef32735a70dca535da637d8d08bd5284d212a6c..9008a4bfe72f46bfd9ca478df6b8b10acf25b1b3 100644 (file)
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -84,8 +84,6 @@
 /************/
 #include <linux/config.h>
 
-#include <linux/version.h>
-
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 3b86716b0b3083cfef497bf8635717a76ca95eef..e26a3aa12af7ccb4707e53f3aaab1d6cc4858c3c 100644 (file)
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -38,7 +38,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/termios.h>

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index f26a6e1dd76e9500cd62b5a10ff13bf9069b8eaf..c43a152bc469413a8dee71b97c16d96730249599 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -35,7 +35,6 @@
 #include <linux/serial.h>
 #include <linux/cdk.h>
 #include <linux/comstats.h>
-#include <linux/version.h>
 #include <linux/istallion.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>

diff --git a/drivers/char/lp_old98.c b/drivers/char/lp_old98.c
index 87695ee2ec078093c30fd1986e56319395c8e87c..895ca1daf71fdd1893242c159075c3c439c6f082 100644 (file)
--- a/drivers/char/lp_old98.c
+++ b/drivers/char/lp_old98.c
@@ -23,7 +23,6 @@
 #include <linux/fcntl.h>
 #include <linux/delay.h>
 #include <linux/console.h>
-#include <linux/version.h>
 #include <linux/fs.h>
 
 #include <asm/io.h>

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 9d065083780769f593bd977baabc53c897c0aae3..3511769715d20bb4486bdacd7f4760b810e8f72d 100644 (file)
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -32,7 +32,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/errno.h>

diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 360df346a559518999d6bde1458a818a4e8639b8..bdbcffc7c7d3d7aabd0fad268c715bd518ee305e 100644 (file)
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -39,7 +39,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/sched.h>

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index e06e10ed4f378f9c4b3c87f50bb90f178477a0b6..890a15652300524c68eb4e919de0353854196cd4 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -37,7 +37,6 @@
 
 #include <linux/config.h>      
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/sched.h>

diff --git a/drivers/char/pcxx.c b/drivers/char/pcxx.c
index 78aa18b4e81c88dcc3d289d8bad2e13761289708..3d3ad669da103b23e5b92c4de283996d1c71ad94 100644 (file)
--- a/drivers/char/pcxx.c
+++ b/drivers/char/pcxx.c
@@ -65,7 +65,6 @@
 #include <linux/tty_driver.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/version.h>
 
 #ifndef MODULE
 #include <linux/ctype.h> /* We only need it for parsing the "digi="-line */

diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 7454df745173766ca752eb6438cbce38153955bd..1d75ebddeee510f00244c65e2b13caf361b0c1c1 100644 (file)
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -53,7 +53,6 @@
 #include <linux/fcntl.h>
 #include <linux/major.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/miscdevice.h>

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 50fab08d460f377dcebf31013b0b4a55eaf7236c..843c4b5f8bd8fc87cc47e7c8d4103bfd56f20891 100644 (file)
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -85,11 +85,9 @@
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/major.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/wait.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index a656925ef83fbdbe3dc603a2e402576e96f81b2d..c0904c2bbe7134777f31eb80cb5b955a2b051105 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -70,7 +70,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 
-#include <linux/version.h>
 #include <asm/uaccess.h>
 #include <linux/init.h>
 

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 12fa11de37d73470e4c5ed3361b8989e44fb6ac6..cd061d88fad466956d1875e5e1dafef91569ee14 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -28,7 +28,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h> /* for linux/stallion.h */
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 68bb9b10b309878d7b91b3e7635fcec0376230d4..7ae703380821dd4dc8abc133f99dd3d06ec27a81 100644 (file)
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -240,7 +240,6 @@
 #include "sxwindow.h"
 
 #include <linux/generic_serial.h>
-#include <asm/uaccess.h>
 #include "sx.h"
 
 

diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 7a1f939da5bbb3112b6389e35e6aa2eba85439a7..ec21a16ac052f037f444b70c78aede9ab5f3ba37 100644 (file)
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -57,7 +57,6 @@
 #define TOSH_DEBUG 0
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>

diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index 2c84b2314ffbf5768f20dd9423283b3431c273be..6f78334173cbe2a3b81f68a0a10708ea6cf88c33 100644 (file)
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -29,7 +29,6 @@
 #include <linux/fcntl.h>
 #include <linux/major.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/miscdevice.h>
 #include <linux/console.h>

diff --git a/drivers/char/watchdog/amd7xx_tco.c b/drivers/char/watchdog/amd7xx_tco.c
index 5418e6134d9cbe995463bc32eda55f03acbd776e..78240eeaa784e224ed83376244365f3aabcb6f6c 100644 (file)
--- a/drivers/char/watchdog/amd7xx_tco.c
+++ b/drivers/char/watchdog/amd7xx_tco.c
@@ -19,13 +19,11 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
-#include <linux/ioport.h>
 #include <asm/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>

diff --git a/include/linux/ftape.h b/include/linux/ftape.h
index e21d4b442843216fdcd1c84f5f63ddf1195f36b9..5774b1bfc04575078148b4dd1411dd4fa32ea8ef 100644 (file)
--- a/include/linux/ftape.h
+++ b/include/linux/ftape.h
@@ -35,7 +35,6 @@
 #include <linux/mm.h>
 #endif
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/mtio.h>
 

diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 0376ed672c0b76090745fadd3adcc27b359801db..8e72597f2b741a0bebcaffa5973f53ab1b65f83b 100644 (file)
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -21,6 +21,8 @@
  *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/version.h>
+
 /*****************************************************************************/
 #ifndef        _ISTALLION_H
 #define        _ISTALLION_H

diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index b4a17afde7df7e1bb267464be942c942db8ad96f..6b92d29979caca9fd1bd95b1e1a9bd3971777fcc 100644 (file)
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -19,6 +19,7 @@
  * For definitions of the flags field, see tty.h
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/termios.h>
 #include <linux/workqueue.h>

diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index bb0d71b263d1be84b1fbd2f9647bccb275a0e341..228180adb5ecf4cb851699d2eadaf8613ef82763 100644 (file)
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -21,6 +21,8 @@
  *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/version.h>
+
 /*****************************************************************************/
 #ifndef        _STALLION_H
 #define        _STALLION_H