diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-11 00:45:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-11 00:45:43 -0300 |
| commit | 0010cbf0481fc24cd2caef60f52e2db0fed03d8f (patch) | |
| tree | ea69d567a737d145a900af9bc6a5279aef39a8bd /linux/drivers/media/video/ivtv/ivtv-driver.c | |
| parent | 5c0ccf5abb197a10ad9804ad3ca09b4f68a8f46a (diff) | |
| parent | 9161baec7bedce1645bcde506cbc211d0a739e71 (diff) | |
| download | mediapointer-dvb-s2-0010cbf0481fc24cd2caef60f52e2db0fed03d8f.tar.gz mediapointer-dvb-s2-0010cbf0481fc24cd2caef60f52e2db0fed03d8f.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index b8b0ac859..fdb2e5848 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -887,7 +887,9 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) #ifndef CONFIG_VIDEO_SAA7127 hw = ivtv_request_module(itv, hw, "saa7127", IVTV_HW_SAA7127); #endif +#ifndef CONFIG_VIDEO_SAA717X hw = ivtv_request_module(itv, hw, "saa717x", IVTV_HW_SAA717X); +#endif #ifndef CONFIG_VIDEO_UPD64031A hw = ivtv_request_module(itv, hw, "upd64031a", IVTV_HW_UPD64031A); #endif |