diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:10:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:10:50 -0200 |
| commit | f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86 (patch) | |
| tree | 44efbb99651f24cb3a75c29bc3c0c33ef25b1c3e /linux/drivers/media/video/ivtv/ivtv-driver.c | |
| parent | e77871b7c84f213b57e7f34d30e2d9e45f59d8b5 (diff) | |
| parent | 67da9a2a1f4c26fb835d42f1ba1a2c9b7542bf54 (diff) | |
| download | mediapointer-dvb-s2-f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86.tar.gz mediapointer-dvb-s2-f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index 051593a17..0a00c023c 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -185,6 +185,8 @@ MODULE_PARM_DESC(cardtype, "\t\t\t19 = Yuan PG600V2/GotView PCI DVD Lite\n" "\t\t\t20 = Club3D ZAP-TV1x01\n" "\t\t\t21 = AverTV MCE 116 Plus\n" + "\t\t\t22 = ASUS Falcon2\n" + "\t\t\t23 = AverMedia PVR-150 Plus\n" "\t\t\t 0 = Autodetect (default)\n" "\t\t\t-1 = Ignore this card\n\t\t"); MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60"); @@ -886,6 +888,10 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) if (hw & IVTV_HW_CS53L32A) ivtv_request_module(itv, "cs53l32a"); #endif +#ifndef CONFIG_VIDEO_M52790 + if (hw & IVTV_HW_M52790) + ivtv_request_module(itv, "m52790"); +#endif /* check which i2c devices are actually found */ for (i = 0; i < 32; i++) { |