2 files changed, 1 insertions, 34 deletions

diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index f278d980b83a..ef8c05e19295 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -9,6 +9,7 @@ config VIDEO_PVRUSB2
         select VIDEO_CX25840
         select VIDEO_MSP3400
         select VIDEO_WM8775
+        select VIDEO_CS53L32A
         ---help---
           This is a video4linux driver for Conexant 23416 based
           usb2 personal video recorder devices.
@@ -16,32 +17,6 @@ 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_SYSFS
         bool "pvrusb2 sysfs support (EXPERIMENTAL)"
         default y
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 3a141d93e1a9..5bf6d8fda1f9 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -153,7 +153,6 @@ static const struct pvr2_device_desc pvr2_device_gotview_2d = {
 
 
 
-#ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR
 /*------------------------------------------------------------------------*/
 /* OnAir Creator */
 
@@ -212,11 +211,9 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = {
                 .dvb_props = &pvr2_onair_creator_fe_props,
 #endif
 };
-#endif
 
 
 
-#ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_USB2
 /*------------------------------------------------------------------------*/
 /* OnAir USB 2.0 */
 
@@ -274,7 +271,6 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
                 .dvb_props = &pvr2_onair_usb2_fe_props,
 #endif
 };
-#endif
 
 
 
@@ -497,14 +493,10 @@ struct usb_device_id pvr2_device_table[] = {
           .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2},
         { USB_DEVICE(0x1164, 0x0602),
           .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2d},
-#ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR
         { USB_DEVICE(0x11ba, 0x1003),
           .driver_info = (kernel_ulong_t)&pvr2_device_onair_creator},
-#endif
-#ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_USB2
         { USB_DEVICE(0x11ba, 0x1001),
           .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2},
-#endif
         { USB_DEVICE(0x2040, 0x7300),
           .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
         { USB_DEVICE(0x2040, 0x7500),