diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 18:18:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 18:18:27 -0300 |
| commit | 6eff80b62a63ef584a51445354d899d0e35046db (patch) | |
| tree | a3a3db3314521713964bd636fa92e2b15670269c /linux/drivers/media | |
| parent | d80b9a6dbd8d4d3d0366b9ccb92e6afb51f45554 (diff) | |
| parent | d1bc61a9a24dd11c7c73b4bc31aa691a69ae0dc2 (diff) | |
| download | mediapointer-dvb-s2-6eff80b62a63ef584a51445354d899d0e35046db.tar.gz mediapointer-dvb-s2-6eff80b62a63ef584a51445354d899d0e35046db.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvmixer.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 0fdcb19cb..4c233c41f 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -1284,11 +1284,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) u8 b1[] = { 0x61 }; u8 *b; char idstring[21]; -#ifndef TTUSB_KERNEL - u8 *firmware = NULL; -#else const u8 *firmware = NULL; -#endif size_t firmware_size = 0; u16 firmware_csum = 0; __be16 firmware_csum_ns; diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index 7c1e1a850..fd2e902ea 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -9,6 +9,7 @@ #include <linux/errno.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/smp_lock.h> #include "compat.h" #include <linux/videodev.h> #include <linux/init.h> |