diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 14:32:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 14:32:00 -0300 |
| commit | 1ae05bf0de9d8d9f666aaf90e979b493531a8d22 (patch) | |
| tree | a201632fab0519830f0bdf0d6adc7fc4c8d9e90b /linux/drivers/media/video/em28xx/em28xx-cards.c | |
| parent | 5d7bbbc2deda111b6ff82eb3bad4b576eac94d3d (diff) | |
| parent | fdbc4f16f905bdbd39641f297b2b63cde17f17a5 (diff) | |
| download | mediapointer-dvb-s2-1ae05bf0de9d8d9f666aaf90e979b493531a8d22.tar.gz mediapointer-dvb-s2-1ae05bf0de9d8d9f666aaf90e979b493531a8d22.tar.bz2 | |
Merge from hverkuil routing tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index de6d61d3c..3622019e3 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -29,10 +29,10 @@ #include <linux/usb.h> #include "compat.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" @@ -148,11 +148,12 @@ struct em28xx_board em28xx_boards[] = { .input = {{ .type = EM28XX_VMUX_TELEVISION, .vmux = 0, - .amux = 6, + .amux = MSP_INPUT_DEFAULT, },{ .type = EM28XX_VMUX_SVIDEO, .vmux = 2, - .amux = 1, + .amux = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1, + MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART), }}, }, #ifdef CONFIG_XC3028 |