diff -r 6ee808e7772f linux/drivers/media/video/Kconfig --- a/linux/drivers/media/video/Kconfig Tue Aug 22 16:14:36 2006 -0300 +++ b/linux/drivers/media/video/Kconfig Tue Aug 22 17:41:27 2006 -0300 @@ -15,6 +15,19 @@ config VIDEO_ADV_DEBUG Say Y here to enable advanced debugging functionality on some V4L devices. In doubt, say N. + +config VIDEO_HELPER_CHIPS_AUTO + bool "Autoselect pertinent encoders/decoders" + default y + ---help--- + Most video cards may require additional modules to encode or + decode audio/video standards. This option will autoselect + all pertinent modules to each selected video module. + + Unselect this only if you know exaclty what you are doing, since + it may break support on some boards. + + In doubt, say Y. config VIDEO_VIVI tristate "Virtual Video Driver" @@ -164,7 +177,7 @@ config VIDEO_VINO tristate "SGI Vino Video For Linux (EXPERIMENTAL)" depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2 select I2C_ALGO_SGI - select VIDEO_SAA7191 + select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO help Say Y here to build in support for the Vino video input system found on SGI Indy machines. @@ -196,8 +209,8 @@ config VIDEO_ZORAN_BUZ config VIDEO_ZORAN_BUZ tristate "Iomega Buz support" depends on VIDEO_ZORAN - select VIDEO_SAA7111 - select VIDEO_SAA7185 + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_ZORAN_ZR36060 help Support for the Iomega Buz MJPEG capture/playback card. @@ -206,7 +219,7 @@ config VIDEO_ZORAN_DC10 tristate "Pinnacle/Miro DC10(+) support" depends on VIDEO_ZORAN select VIDEO_SAA7110 - select VIDEO_ADV7175 + select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_ZORAN_ZR36060 help Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback @@ -215,8 +228,8 @@ config VIDEO_ZORAN_DC30 config VIDEO_ZORAN_DC30 tristate "Pinnacle/Miro DC30(+) support" depends on VIDEO_ZORAN - select VIDEO_ADV7175 - select VIDEO_VPX3220 + select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO help Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback card. This also supports really old DC10 cards based on the @@ -225,8 +238,8 @@ config VIDEO_ZORAN_LML33 config VIDEO_ZORAN_LML33 tristate "Linux Media Labs LML33 support" depends on VIDEO_ZORAN - select VIDEO_BT819 - select VIDEO_BT856 + select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_ZORAN_ZR36060 help Support for the Linux Media Labs LML33 MJPEG capture/playback @@ -235,8 +248,8 @@ config VIDEO_ZORAN_LML33R10 config VIDEO_ZORAN_LML33R10 tristate "Linux Media Labs LML33R10 support" depends on VIDEO_ZORAN - select VIDEO_SAA7114 - select VIDEO_ADV7170 + select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_ZORAN_ZR36060 help support for the Linux Media Labs LML33R10 MJPEG capture/playback @@ -245,8 +258,8 @@ config VIDEO_ZORAN_AVS6EYES config VIDEO_ZORAN_AVS6EYES tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1 - select VIDEO_BT856 - select VIDEO_KS0127 + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_ZORAN_ZR36060 help Support for the AverMedia 6 Eyes video surveillance card. @@ -284,10 +297,10 @@ config VIDEO_MXB depends on PCI && VIDEO_V4L1 select VIDEO_SAA7146_VV select VIDEO_TUNER - select VIDEO_SAA7111 - select VIDEO_TDA9840 - select VIDEO_TEA6415C - select VIDEO_TEA6420 + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO ---help--- This is a video4linux driver for the 'Multimedia eXtension Board' TV card by Siemens-Nixdorf. @@ -299,7 +312,7 @@ config VIDEO_DPC tristate "Philips-Semiconductors 'dpc7146 demonstration board'" depends on PCI && VIDEO_V4L1 select VIDEO_SAA7146_VV - select VIDEO_SAA7111 + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO ---help--- This is a video4linux driver for the 'dpc7146 demonstration board' by Philips-Semiconductors. It's the reference design diff -r 6ee808e7772f linux/drivers/media/video/bt8xx/Kconfig --- a/linux/drivers/media/video/bt8xx/Kconfig Tue Aug 22 16:14:36 2006 -0300 +++ b/linux/drivers/media/video/bt8xx/Kconfig Tue Aug 22 17:41:27 2006 -0300 @@ -8,10 +8,10 @@ config VIDEO_BT848 select VIDEO_IR select VIDEO_TUNER select VIDEO_TVEEPROM - select VIDEO_MSP3400 - select VIDEO_TVAUDIO - select VIDEO_TDA7432 - select VIDEO_TDA9875 + select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TDA7432 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TDA9875 if VIDEO_HELPER_CHIPS_AUTO ---help--- Support for BT848 based frame grabber/overlay boards. This includes the Miro, Hauppauge and STB boards. Please read the material in diff -r 6ee808e7772f linux/drivers/media/video/em28xx/Kconfig --- a/linux/drivers/media/video/em28xx/Kconfig Tue Aug 22 16:14:36 2006 -0300 +++ b/linux/drivers/media/video/em28xx/Kconfig Tue Aug 22 17:41:27 2006 -0300 @@ -5,8 +5,8 @@ config VIDEO_EM28XX select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_IR - select VIDEO_SAA711X - select VIDEO_TVP5150 + select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO ---help--- This is a video4linux driver for Empia 28xx based TV cards. diff -r 6ee808e7772f linux/drivers/media/video/pvrusb2/Kconfig --- a/linux/drivers/media/video/pvrusb2/Kconfig Tue Aug 22 16:14:36 2006 -0300 +++ b/linux/drivers/media/video/pvrusb2/Kconfig Tue Aug 22 17:41:27 2006 -0300 @@ -5,14 +5,25 @@ config VIDEO_PVRUSB2 select VIDEO_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X - select VIDEO_SAA711X - select VIDEO_MSP3400 ---help--- This is a video4linux driver for Conexant 23416 based usb2 personal video recorder devices. To compile this driver as a module, choose M here: the module will be called pvrusb2 + +config VIDEO_PVRUSB2_29XXX + bool "Hauppauge WinTV-PVR USB2 support for 29xxx model series" + depends on VIDEO_PVRUSB2 && EXPERIMENTAL + select VIDEO_SAA711X + select VIDEO_MSP3400 + This option enables support for WinTV-PVR USB2 devices whose + model number is of the form "29xxx" (leading prefix of "29" + followed by 3 digits). + To see if you may need this option, examine the white + sticker on the underside of your device. + + If you are in doubt, say Y. config VIDEO_PVRUSB2_24XXX bool "Hauppauge WinTV-PVR USB2 support for 24xxx model series" @@ -60,3 +71,5 @@ config VIDEO_PVRUSB2_DEBUGIFC You do not need to select this option unless you plan on debugging the driver or performing a manual firmware extraction. + + If you are in doubt, say N.