[i2c] [PATCH] i2c: Cleanup the includes of <linux/i2c.h>

Jean Delvare khali at linux-fr.org
Thu Mar 1 13:00:02 CET 2007


Subject: i2c: Cleanup the includes of <linux/i2c.h>

Clean up the includes of <linux/i2c.h>. Only include this header file
when we actually need it.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 arch/powerpc/platforms/powermac/cpufreq_32.c    |    1 -
 drivers/media/video/cx2341x.c                   |    1 -
 drivers/media/video/ovcamchip/ovcamchip_priv.h  |    1 +
 drivers/media/video/usbvision/usbvision-cards.c |    1 -
 include/media/ovcamchip.h                       |    1 -
 include/media/tuner.h                           |    1 +
 sound/oss/dmasound/tas_ioctl.h                  |    1 -
 7 files changed, 2 insertions(+), 5 deletions(-)

--- linux-2.6.21-rc2.orig/arch/powerpc/platforms/powermac/cpufreq_32.c	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc2/arch/powerpc/platforms/powermac/cpufreq_32.c	2007-02-28 20:19:00.000000000 +0100
@@ -25,7 +25,6 @@
 #include <linux/cpufreq.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
-#include <linux/i2c.h>
 #include <linux/hardirq.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
--- linux-2.6.21-rc2.orig/drivers/media/video/cx2341x.c	2007-02-28 09:48:20.000000000 +0100
+++ linux-2.6.21-rc2/drivers/media/video/cx2341x.c	2007-02-28 20:18:35.000000000 +0100
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/videodev2.h>
-#include <linux/i2c.h>
 
 #include <media/tuner.h>
 #include <media/cx2341x.h>
--- linux-2.6.21-rc2.orig/drivers/media/video/usbvision/usbvision-cards.c	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc2/drivers/media/video/usbvision/usbvision-cards.c	2007-02-28 20:18:29.000000000 +0100
@@ -24,7 +24,6 @@
 
 
 #include <linux/list.h>
-#include <linux/i2c.h>
 #include <media/v4l2-dev.h>
 #include <media/tuner.h>
 #include "usbvision.h"
--- linux-2.6.21-rc2.orig/include/media/ovcamchip.h	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc2/include/media/ovcamchip.h	2007-02-28 20:18:16.000000000 +0100
@@ -16,7 +16,6 @@
 
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
-#include <linux/i2c.h>
 
 /* --------------------------------- */
 /*           ENUMERATIONS            */
--- linux-2.6.21-rc2.orig/sound/oss/dmasound/tas_ioctl.h	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc2/sound/oss/dmasound/tas_ioctl.h	2007-02-28 20:20:33.000000000 +0100
@@ -1,7 +1,6 @@
 #ifndef _TAS_IOCTL_H_
 #define _TAS_IOCTL_H_
 
-#include <linux/i2c.h>
 #include <linux/soundcard.h>
 
 
--- linux-2.6.21-rc2.orig/drivers/media/video/ovcamchip/ovcamchip_priv.h	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc2/drivers/media/video/ovcamchip/ovcamchip_priv.h	2007-02-28 20:24:20.000000000 +0100
@@ -15,6 +15,7 @@
 #ifndef __LINUX_OVCAMCHIP_PRIV_H
 #define __LINUX_OVCAMCHIP_PRIV_H
 
+#include <linux/i2c.h>
 #include <media/ovcamchip.h>
 
 #ifdef DEBUG
--- linux-2.6.21-rc2.orig/include/media/tuner.h	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc2/include/media/tuner.h	2007-02-28 20:22:18.000000000 +0100
@@ -23,6 +23,7 @@
 #define _TUNER_H
 
 #include <linux/videodev2.h>
+#include <linux/i2c.h>
 #include <media/tuner-types.h>
 
 extern int tuner_debug;


-- 
Jean Delvare



More information about the i2c mailing list