diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-08 12:33:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-08 14:18:18 -0400 |
| commit | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (patch) | |
| tree | 9034d676d9096857a380aab9d99e3e88fccb6bfe /drivers/media/video/em28xx/em28xx-cards.c | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
| parent | aeee90dfa01844168cd7f8051d0a0f969c573067 (diff) | |
Merge Linus' latest into master
Conflicts:
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/ixp2000_wdt.c
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ks8695_wdt.c
drivers/watchdog/omap_wdt.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 476ae44a62d2..452da70e719f 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
| @@ -1015,6 +1015,7 @@ struct em28xx_board em28xx_boards[] = { | |||
| 1015 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 1015 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
| 1016 | .vchannels = 3, | 1016 | .vchannels = 3, |
| 1017 | .tuner_type = TUNER_XC2028, | 1017 | .tuner_type = TUNER_XC2028, |
| 1018 | .mts_firmware = 1, | ||
| 1018 | .decoder = EM28XX_TVP5150, | 1019 | .decoder = EM28XX_TVP5150, |
| 1019 | .input = { { | 1020 | .input = { { |
| 1020 | .type = EM28XX_VMUX_TELEVISION, | 1021 | .type = EM28XX_VMUX_TELEVISION, |