diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 22:10:43 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 22:10:43 -0300 |
commit | 2c8b481bed8efbeda28d5b75e0aeb5c089fc76e8 (patch) | |
tree | 932a12ebc998b983aef1e076a23f5f882d65b6b3 /linux/drivers/media | |
parent | 5c878b664038ece4cce098757bef26d5a5aa7269 (diff) | |
parent | 2b01e0e4cd5cd2969d0b64c23608f18da907e20b (diff) | |
download | mediapointer-dvb-s2-2c8b481bed8efbeda28d5b75e0aeb5c089fc76e8.tar.gz mediapointer-dvb-s2-2c8b481bed8efbeda28d5b75e0aeb5c089fc76e8.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 2 | ||||
-rw-r--r-- | linux/drivers/media/video/tveeprom.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index 41997dd18..f42a97314 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -313,7 +313,7 @@ static void cx18_process_eeprom(struct cx18 *cx) CX18_INFO("Autodetected %s\n", cx->card_name); if (tv.tuner_type == TUNER_ABSENT) - CX18_ERR("tveeprom cannot autodetect tuner!"); + CX18_ERR("tveeprom cannot autodetect tuner!\n"); if (cx->options.tuner == -1) cx->options.tuner = tv.tuner_type; diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index cdea91aae..7d6459dd2 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -211,7 +211,7 @@ hauppauge_tuner[] = { TUNER_TEA5767, "Philips TEA5768HL FM Radio"}, { TUNER_ABSENT, "Panasonic ENV57H12D5"}, { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"}, - { TUNER_ABSENT, "TCL MNM05-4"}, + { TUNER_PHILIPS_FM1236_MK3, "TCL MNM05-4"}, { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"}, { TUNER_ABSENT, "TCL MQNM05-4"}, { TUNER_ABSENT, "LG TAPC-W701D"}, |