diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-25 17:54:09 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-25 17:54:09 +0200 |
| commit | b63fc1f2e15fdcbb60351659913c5d697b62e053 (patch) | |
| tree | 5a8a3c4e2e3e057e069931d88c6c644f944ac43e /linux/drivers/media/video/cx88 | |
| parent | e2d4a5995647766cb059191c3490ef28775993ea (diff) | |
| parent | 056321ad6ae880ef351ccdf1180598cdeee63895 (diff) | |
| download | mediapointer-dvb-s2-b63fc1f2e15fdcbb60351659913c5d697b62e053.tar.gz mediapointer-dvb-s2-b63fc1f2e15fdcbb60351659913c5d697b62e053.tar.bz2 | |
Merge: from hg/~hverkuil/v4l-dvb2
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 32ea481b2..15b9ab709 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -30,7 +30,6 @@ #endif #include <linux/dma-mapping.h> #include <linux/interrupt.h> -#include <linux/dma-mapping.h> #include <asm/delay.h> #include "cx88.h" diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 15273bbe6..d67bfb527 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -39,7 +39,6 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #include <linux/kthread.h> #endif -#include <linux/dma-mapping.h> #include <asm/div64.h> #include "cx88.h" |