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

From: Randy Hron <rwhron@earthlink.net>

version.h cleanup and remove duplicate #includes.

diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 8775a874caf2b0fd34c2ae8181cf9f871afa72e1..392f131bf68eff1c1016eae553050dc560df6766 100644 (file)
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -1,3 +1,4 @@
+#include <linux/version.h>
 #include <media/saa7146_vv.h>
 
 /* helper function */

diff --git a/drivers/media/dvb/dvb-core/dvb_functions.c b/drivers/media/dvb/dvb-core/dvb_functions.c
index 51ce1a936a49aa08bde7c22f6f8d49e21b511856..d608fdbb17693e6f438be1a75f270c929b93eb8b 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_functions.c
+++ b/drivers/media/dvb/dvb-core/dvb_functions.c
@@ -1,4 +1,3 @@
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/string.h>

diff --git a/drivers/media/dvb/dvb-core/dvb_functions.h b/drivers/media/dvb/dvb-core/dvb_functions.h
index d585833db713c6f8057a4203f9ccd23b511e49d1..67ccf09d7ee412b711c9ad89914071a978337b3c 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_functions.h
+++ b/drivers/media/dvb/dvb-core/dvb_functions.h
@@ -1,8 +1,6 @@
 #ifndef __DVB_FUNCTIONS_H__
 #define __DVB_FUNCTIONS_H__
 
-#include <linux/version.h>
-
 /**
  *  a sleeping delay function, waits i ms
  *

diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index b349a2d2de4852787f90028f81f078245cb8fce7..137a8dd4d04258a8dcd69da38a6093cc30b8fb91 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -28,7 +28,6 @@
 #include <linux/poll.h>
 #include <linux/fs.h>
 #include <linux/list.h>
-#include <linux/version.h>
 #include <linux/devfs_fs_kernel.h>
 
 #define DVB_MAJOR 250

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 4586fbd4ba54054647e758c1421a720882b48926..5b70ff3ae04bf81efe13ce1c85c801b1eb9c75bd 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -55,10 +55,8 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/pci.h>
-#include <linux/init.h>
 #include <linux/vmalloc.h>
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>

diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 7738b79dbbd2df043b7e803f555ddae231ce6045..94827cb5a75c2e10fbd35588a1c65349f6be63a2 100644 (file)
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -9,6 +9,7 @@
  *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
  */
+#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/wait.h>
@@ -27,7 +28,6 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 #include <linux/pci.h>
-#include <linux/usb.h>
 
 #include "dvb_functions.h"
 

diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index a7bc8c11e95676008399e09a8e4e02077112fc75..a45299a11af6ea7b01ea6a0f796197e6c736d249 100644 (file)
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/slab.h>

diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index a1b359a05d159a31083ffbc125a8e1a75853b9e2..86217cb163afdc70408d26630dc2aef0be60549b 100644 (file)
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -37,7 +37,6 @@
  ***************************************************************************
  */
 
-#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/list.h>

diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 731356b65e3ccde5cbe9548704ac06bc7e6887d1..7e0ef818fb30ee09cac7d6c8f3cebf13ddfd4cbc 100644 (file)
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -25,6 +25,7 @@
 #define _BTTVP_H_
 
 
+#include <linux/version.h>
 #define BTTV_VERSION_CODE KERNEL_VERSION(0,9,11)
 
 #include <linux/types.h>

diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 67fff33ce5b3c642833d7b8c8ef2d1c05fc940ee..2831214827843ca81dd353759745ea559bf6bb29 100644 (file)
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -36,8 +36,6 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/sonypi.h>
-#include <linux/meye.h>
 
 /****************************************************************************/
 /* Motion JPEG chip registers                                               */

diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 1ee9f2ac5274bc952f9788c9afbd81103edfc032..0408b210b1bdcade9391c67f9d2e3511cc1b0c31 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -18,6 +18,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/i2c.h>
 #include <linux/videodev.h>