aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-10-30 04:50:03 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:01:50 -0500
commite2a1774d9c8b866db65853fd1a17e5f472dd5cf2 (patch)
treeb1269a546476bb6102b0b14c577b31ba5367df19 /drivers/media/video/ivtv/ivtv-driver.c
parent05e997197e459a03df577ba49c34c1820957ee4a (diff)
V4L/DVB (6488): ivtv: add ASUS Falcon2 support
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index ec40453e46e4..a8aca14f98a8 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -185,6 +185,7 @@ MODULE_PARM_DESC(cardtype,
185 "\t\t\t19 = Yuan PG600V2/GotView PCI DVD Lite\n" 185 "\t\t\t19 = Yuan PG600V2/GotView PCI DVD Lite\n"
186 "\t\t\t20 = Club3D ZAP-TV1x01\n" 186 "\t\t\t20 = Club3D ZAP-TV1x01\n"
187 "\t\t\t21 = AverTV MCE 116 Plus\n" 187 "\t\t\t21 = AverTV MCE 116 Plus\n"
188 "\t\t\t22 = ASUS Falcon2\n"
188 "\t\t\t 0 = Autodetect (default)\n" 189 "\t\t\t 0 = Autodetect (default)\n"
189 "\t\t\t-1 = Ignore this card\n\t\t"); 190 "\t\t\t-1 = Ignore this card\n\t\t");
190MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60"); 191MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
@@ -882,6 +883,10 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
882 if (hw & IVTV_HW_CS53L32A) 883 if (hw & IVTV_HW_CS53L32A)
883 ivtv_request_module(itv, "cs53l32a"); 884 ivtv_request_module(itv, "cs53l32a");
884#endif 885#endif
886#ifndef CONFIG_VIDEO_M52790
887 if (hw & IVTV_HW_M52790)
888 ivtv_request_module(itv, "m52790");
889#endif
885 890
886 /* check which i2c devices are actually found */ 891 /* check which i2c devices are actually found */
887 for (i = 0; i < 32; i++) { 892 for (i = 0; i < 32; i++) {