diff --git a/[refs] b/[refs] index 371851f089c8..7f7d2d5881b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4542783c3733de9a21099cd0c42e1a2392c68a88 +refs/heads/master: 5edfded4811175283c745c9309c9315b721cf674 diff --git a/trunk/drivers/media/video/pvrusb2/Kconfig b/trunk/drivers/media/video/pvrusb2/Kconfig index d0c2cd785430..e8e231d8446d 100644 --- a/trunk/drivers/media/video/pvrusb2/Kconfig +++ b/trunk/drivers/media/video/pvrusb2/Kconfig @@ -12,6 +12,32 @@ config VIDEO_PVRUSB2 To compile this driver as a module, choose M here: the module will be called pvrusb2 +config VIDEO_PVRUSB2_ONAIR_CREATOR + bool "pvrusb2 driver support for OnAir Creator model" + depends on VIDEO_PVRUSB2 && EXPERIMENTAL + select VIDEO_SAA711X + select VIDEO_CS53L32A + ---help--- + + This option enables support for the OnAir Creator USB tuner + device. This is a hybrid device, however currently only + analog mode is supported. + + If you are in doubt, say Y. + +config VIDEO_PVRUSB2_ONAIR_USB2 + bool "pvrusb2 driver support for OnAir USB2 model" + depends on VIDEO_PVRUSB2 && EXPERIMENTAL + select VIDEO_SAA711X + select VIDEO_CS53L32A + ---help--- + + This option enables support for the OnAir USB2 tuner device + (also known as the Sasem tuner). This is a hybrid device, + however currently only analog mode is supported. + + If you are in doubt, say Y. + config VIDEO_PVRUSB2_29XXX bool "Hauppauge WinTV-PVR USB2 support for 29xxx model series" depends on VIDEO_PVRUSB2 && EXPERIMENTAL