Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[linux-2.6-omap-h63xx.git] / drivers / media / video / em28xx / em28xx-cards.c

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 00665d6ffc17c21ff04499a0f4f85b11c12ce48d..3ba3439db580f605a32a5fc3b5982c810387e0f3 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -28,10 +28,10 @@
 #include <linux/i2c.h>
 #include <linux/usb.h>
 #include <media/tuner.h>
-#include <media/audiochip.h>
+#include <media/msp3400.h>
 #include <media/tveeprom.h>
+#include <media/audiochip.h>
 #include <media/v4l2-common.h>
-#include "msp3400.h"
 
 #include "em28xx.h"
 
@@ -147,79 +147,12 @@ struct em28xx_board em28xx_boards[] = {
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = 0,
-                       .amux     = 6,
-               },{
-                       .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = 2,
-                       .amux     = 1,
-               }},
-       },
-       [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
-               .name         = "Hauppauge WinTV HVR 900",
-               .vchannels    = 3,
-               .norm         = VIDEO_MODE_PAL,
-               .tda9887_conf = TDA9887_PRESENT,
-               .tuner_type   = TUNER_XCEIVE_XC3028,
-               .has_tuner    = 1,
-               .decoder      = EM28XX_TVP5150,
-               .input          = {{
-                       .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = 2,
-                       .amux     = 1,
-               },{
-                       .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = 0,
-                       .amux     = 0,
-               },{
-                       .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = 9,
-                       .amux     = 1,
-               }},
-       },
-       [EM2880_BOARD_TERRATEC_HYBRID_XS] = {
-               .name         = "Terratec Hybrid XS",
-               .vchannels    = 3,
-               .norm         = VIDEO_MODE_PAL,
-               .tda9887_conf = TDA9887_PRESENT,
-               .has_tuner    = 1,
-               .tuner_type   = TUNER_XCEIVE_XC3028,
-               .decoder      = EM28XX_TVP5150,
-               .input          = {{
-                       .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = 0,
-                       .amux     = 0,
-               },{
-                       .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = 2,
-                       .amux     = 1,
+                       .amux     = MSP_INPUT_DEFAULT,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = 9,
-                       .amux     = 1,
-               }},
-       },
-       /* maybe there's a reason behind it why Terratec sells the Hybrid XS as Prodigy XS with a
-        * different PID, let's keep it separated for now maybe we'll need it lateron */
-       [EM2880_BOARD_TERRATEC_PRODIGY_XS] = {
-               .name         = "Terratec Prodigy XS",
-               .vchannels    = 3,
-               .norm         = VIDEO_MODE_PAL,
-               .tda9887_conf = TDA9887_PRESENT,
-               .has_tuner    = 1,
-               .tuner_type   = TUNER_XCEIVE_XC3028,
-               .decoder      = EM28XX_TVP5150,
-               .input          = {{
-                       .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = 0,
-                       .amux     = 0,
-               },{
-                       .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = 2,
-                       .amux     = 1,
-               },{
-                       .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = 9,
-                       .amux     = 1,
+                       .amux     = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
+                                       MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
                }},
        },
        [EM2820_BOARD_MSI_VOX_USB_2] = {
@@ -340,9 +273,6 @@ struct usb_device_id em28xx_id_table [] = {
        { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
        { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
        { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
-       { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
-       { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
-       { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
        { },
 };