diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:42:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:42:38 -0300 |
| commit | 6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9 (patch) | |
| tree | f1ba4993d5a649af938967c928f1a78e945f747a /linux/drivers/media/video/pvrusb2 | |
| parent | 503d9b1655773c65ef2d3c1d7f6e67c91717ec74 (diff) | |
| parent | 32027c8007a8b9e82f70f5eb52387db827ff8b2d (diff) | |
| download | mediapointer-dvb-s2-6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9.tar.gz mediapointer-dvb-s2-6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9.tar.bz2 | |
Merge from mchehab saa7115 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig index 262b033f4..9824ad267 100644 --- a/linux/drivers/media/video/pvrusb2/Kconfig +++ b/linux/drivers/media/video/pvrusb2/Kconfig @@ -4,7 +4,7 @@ config VIDEO_PVRUSB2 select FW_LOADER select VIDEO_TUNER select VIDEO_TVEEPROM - select VIDEO_DECODER + select VIDEO_SAA711X select VIDEO_MSP3400 ---help--- This is a video4linux driver for Conexant 23416 based |