diff options
-rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_32.c | 1 | ||||
-rw-r--r-- | drivers/media/video/cx2341x.c | 1 | ||||
-rw-r--r-- | drivers/media/video/ovcamchip/ovcamchip_priv.h | 1 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-cards.c | 1 | ||||
-rw-r--r-- | include/media/ovcamchip.h | 1 | ||||
-rw-r--r-- | include/media/tuner.h | 1 | ||||
-rw-r--r-- | sound/oss/dmasound/tas_ioctl.h | 1 |
7 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c index 8943a9456bb7..1fe35dab0e9e 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_32.c +++ b/arch/powerpc/platforms/powermac/cpufreq_32.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/cpufreq.h> | 25 | #include <linux/cpufreq.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/sysdev.h> | 27 | #include <linux/sysdev.h> |
28 | #include <linux/i2c.h> | ||
29 | #include <linux/hardirq.h> | 28 | #include <linux/hardirq.h> |
30 | #include <asm/prom.h> | 29 | #include <asm/prom.h> |
31 | #include <asm/machdep.h> | 30 | #include <asm/machdep.h> |
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c index 88dbdddeec42..d73c86aeeaac 100644 --- a/drivers/media/video/cx2341x.c +++ b/drivers/media/video/cx2341x.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
29 | #include <linux/i2c.h> | ||
30 | 29 | ||
31 | #include <media/tuner.h> | 30 | #include <media/tuner.h> |
32 | #include <media/cx2341x.h> | 31 | #include <media/cx2341x.h> |
diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h index 1231335a9f4a..50c7763d44b3 100644 --- a/drivers/media/video/ovcamchip/ovcamchip_priv.h +++ b/drivers/media/video/ovcamchip/ovcamchip_priv.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #ifndef __LINUX_OVCAMCHIP_PRIV_H | 15 | #ifndef __LINUX_OVCAMCHIP_PRIV_H |
16 | #define __LINUX_OVCAMCHIP_PRIV_H | 16 | #define __LINUX_OVCAMCHIP_PRIV_H |
17 | 17 | ||
18 | #include <linux/i2c.h> | ||
18 | #include <media/ovcamchip.h> | 19 | #include <media/ovcamchip.h> |
19 | 20 | ||
20 | #ifdef DEBUG | 21 | #ifdef DEBUG |
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c index 13f69fe6360d..51ab265d566a 100644 --- a/drivers/media/video/usbvision/usbvision-cards.c +++ b/drivers/media/video/usbvision/usbvision-cards.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | 25 | ||
26 | #include <linux/list.h> | 26 | #include <linux/list.h> |
27 | #include <linux/i2c.h> | ||
28 | #include <media/v4l2-dev.h> | 27 | #include <media/v4l2-dev.h> |
29 | #include <media/tuner.h> | 28 | #include <media/tuner.h> |
30 | #include "usbvision.h" | 29 | #include "usbvision.h" |
diff --git a/include/media/ovcamchip.h b/include/media/ovcamchip.h index 0f43451f8bb3..05b9569ef1c8 100644 --- a/include/media/ovcamchip.h +++ b/include/media/ovcamchip.h | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <linux/videodev.h> | 17 | #include <linux/videodev.h> |
18 | #include <media/v4l2-common.h> | 18 | #include <media/v4l2-common.h> |
19 | #include <linux/i2c.h> | ||
20 | 19 | ||
21 | /* --------------------------------- */ | 20 | /* --------------------------------- */ |
22 | /* ENUMERATIONS */ | 21 | /* ENUMERATIONS */ |
diff --git a/include/media/tuner.h b/include/media/tuner.h index a41ac41113ac..6dcf3c45707d 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #define _TUNER_H | 23 | #define _TUNER_H |
24 | 24 | ||
25 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
26 | #include <linux/i2c.h> | ||
26 | #include <media/tuner-types.h> | 27 | #include <media/tuner-types.h> |
27 | 28 | ||
28 | extern int tuner_debug; | 29 | extern int tuner_debug; |
diff --git a/sound/oss/dmasound/tas_ioctl.h b/sound/oss/dmasound/tas_ioctl.h index dccae3a40e01..9d12b373b4a9 100644 --- a/sound/oss/dmasound/tas_ioctl.h +++ b/sound/oss/dmasound/tas_ioctl.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _TAS_IOCTL_H_ | 1 | #ifndef _TAS_IOCTL_H_ |
2 | #define _TAS_IOCTL_H_ | 2 | #define _TAS_IOCTL_H_ |
3 | 3 | ||
4 | #include <linux/i2c.h> | ||
5 | #include <linux/soundcard.h> | 4 | #include <linux/soundcard.h> |
6 | 5 | ||
7 | 6 | ||