diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 20:04:17 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 20:04:17 -0300 |
commit | 0aafae9080d12790fd679bc133e3e6679209c48d (patch) | |
tree | c7ba45f6995002f4eff4de79558d8132c5cb7a75 /linux/drivers/media/video/pvrusb2/Kconfig | |
parent | f0247cd71514d266ebf944e17f860f314773e6e9 (diff) | |
parent | 8f0f86249bec74bed8cdcc2c9e587990e2a1d003 (diff) | |
download | mediapointer-dvb-s2-0aafae9080d12790fd679bc133e3e6679209c48d.tar.gz mediapointer-dvb-s2-0aafae9080d12790fd679bc133e3e6679209c48d.tar.bz2 |
Merge from manu 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/Kconfig')
-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 |