diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 18:38:44 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 18:38:44 -0200 |
| commit | fa470dd98c6e9123627972bf290119c66f2ff761 (patch) | |
| tree | 767e3c9010250e1a73f645e35b31441d557051d8 /linux | |
| parent | 44588fb487e94e330e9ea9da744cb35e7f14dc96 (diff) | |
| download | mediapointer-dvb-s2-fa470dd98c6e9123627972bf290119c66f2ff761.tar.gz mediapointer-dvb-s2-fa470dd98c6e9123627972bf290119c66f2ff761.tar.bz2 | |
Two small differences between v4l-dvb and kernel mainstream tree
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/dvb/cinergyT2/cinergyT2.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-core.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index a33f82910..9c0eff865 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -33,6 +33,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif +#include <linux/mm.h> #include "dmxdev.h" #include "dvb_demux.h" diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index 2d20c809d..c5a1e3ddb 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -1776,7 +1776,6 @@ int usbvision_power_off(struct usb_usbvision *usbvision) return errCode; } - /* * usbvision_set_video_format() * |