diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:22:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:22:54 -0300 |
| commit | 2e1679b85048083df6e8456663b76eeb8581b241 (patch) | |
| tree | a63177f1e5fc8e44400f74cbaeeed7a5874d80d0 /linux | |
| parent | db7374187f8985986322076d25a0c7a906e781fa (diff) | |
| download | mediapointer-dvb-s2-2e1679b85048083df6e8456663b76eeb8581b241.tar.gz mediapointer-dvb-s2-2e1679b85048083df6e8456663b76eeb8581b241.tar.bz2 | |
Backport several cleanups at includes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cpia.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx2341x.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/dabusb.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/se401.h | 1 |
7 files changed, 3 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cpia.h b/linux/drivers/media/video/cpia.h index d4f61b037..ed6201abe 100644 --- a/linux/drivers/media/video/cpia.h +++ b/linux/drivers/media/video/cpia.h @@ -48,7 +48,6 @@ #include <linux/videodev.h> #include <media/v4l2-common.h> #include <linux/list.h> -#include <linux/smp_lock.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif diff --git a/linux/drivers/media/video/cx2341x.c b/linux/drivers/media/video/cx2341x.c index 422d2c6a4..d34180c9d 100644 --- a/linux/drivers/media/video/cx2341x.c +++ b/linux/drivers/media/video/cx2341x.c @@ -26,7 +26,6 @@ #include <linux/init.h> #include <linux/types.h> #include <linux/videodev2.h> -#include <linux/i2c.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #include <linux/slab.h> #endif diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index 7131e05a3..a2d0abae6 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -28,6 +28,7 @@ #include <linux/device.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> + #include <asm/delay.h> #include <sound/driver.h> #include <sound/core.h> diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 861ac813e..bd5ed6760 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -29,6 +29,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include <linux/device.h> #endif +#include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <asm/delay.h> diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 9b8edf555..612c8393f 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,4 +1,3 @@ - /* * * device driver for Conexant 2388x based TV cards @@ -34,6 +33,7 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/interrupt.h> +#include <linux/dma-mapping.h> #include <linux/delay.h> #include "compat.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) diff --git a/linux/drivers/media/video/dabusb.c b/linux/drivers/media/video/dabusb.c index 692dbd93c..8d034ca2b 100644 --- a/linux/drivers/media/video/dabusb.c +++ b/linux/drivers/media/video/dabusb.c @@ -37,7 +37,6 @@ #include <asm/atomic.h> #include <linux/delay.h> #include <linux/usb.h> -#include <linux/smp_lock.h> #include "compat.h" #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> diff --git a/linux/drivers/media/video/se401.h b/linux/drivers/media/video/se401.h index 9fd8485f3..bdbb20f75 100644 --- a/linux/drivers/media/video/se401.h +++ b/linux/drivers/media/video/se401.h @@ -6,7 +6,6 @@ #include "compat.h" #include <linux/videodev.h> #include <media/v4l2-common.h> -#include <linux/smp_lock.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif |