diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-29 13:19:54 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-29 13:19:54 -0300 |
commit | 4381ceef6895b12019f4d55a6f5ff9629194b259 (patch) | |
tree | fc4d023b2461b2fb6e4e5bcf85dd1407eec5198a /linux/drivers | |
parent | 324ec1431fd4e714819fa67a36ac613c293b6dbb (diff) | |
parent | 1d8ba1894747a54e41b95de82fdb0288aed65c3d (diff) | |
download | mediapointer-dvb-s2-4381ceef6895b12019f4d55a6f5ff9629194b259.tar.gz mediapointer-dvb-s2-4381ceef6895b12019f4d55a6f5ff9629194b259.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')
-rw-r--r-- | linux/drivers/media/video/tvmixer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index d7b931fd3..6233bf391 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -16,7 +16,6 @@ #include <linux/sound.h> #include <linux/soundcard.h> -#include <asm/semaphore.h> #include <asm/uaccess.h> #define DEV_MAX 4 |