Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / media / video / pvrusb2 / Kconfig

diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 7e727fe..a52171e 100644 (file)
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -5,8 +5,6 @@ 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.
@@ -14,6 +12,20 @@ config VIDEO_PVRUSB2
          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
+       ---help---
+         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"
        depends on VIDEO_PVRUSB2 && EXPERIMENTAL
@@ -60,3 +72,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.