From ac532d001dbd78c75ab437d4b1d975f11221c2b7 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 4 Aug 2008 19:32:35 +0200
Subject: v4l: fix compile errors/warnings.

From: Hans Verkuil <hverkuil@xs4all.nl>

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 4 ----
 linux/drivers/media/video/tvmixer.c           | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'linux/drivers/media')

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>
-- 
cgit v1.2.3