dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

V4L/DVB (9506): ivtv/cx18: fix test whether modules should be loaded or not. 

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2008-11-03 08:06:51 -03:00 committed by Mauro Carvalho Chehab
parent 1a8dc86db1
commit 58ae1c2318
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/cx18/cx18-driver.c
View File

@ -581,10 +581,10 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
#ifdef MODULE
/* load modules */
#ifndef CONFIG_MEDIA_TUNER
#ifdef CONFIG_MEDIA_TUNER_MODULE
hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
#endif
#ifndef CONFIG_VIDEO_CS5345
#ifdef CONFIG_VIDEO_CS5345_MODULE
hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
#endif
#endif

26
drivers/media/video/ivtv/ivtv-driver.c
View File

@ -875,43 +875,43 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
#ifdef MODULE
/* load modules */
#ifndef CONFIG_MEDIA_TUNER
#ifdef CONFIG_MEDIA_TUNER_MODULE
hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER);
#endif
#ifndef CONFIG_VIDEO_CX25840
#ifdef CONFIG_VIDEO_CX25840_MODULE
hw = ivtv_request_module(itv, hw, "cx25840", IVTV_HW_CX25840);
#endif
#ifndef CONFIG_VIDEO_SAA711X
#ifdef CONFIG_VIDEO_SAA711X_MODULE
hw = ivtv_request_module(itv, hw, "saa7115", IVTV_HW_SAA711X);
#endif
#ifndef CONFIG_VIDEO_SAA7127
#ifdef CONFIG_VIDEO_SAA7127_MODULE
hw = ivtv_request_module(itv, hw, "saa7127", IVTV_HW_SAA7127);
#endif
#ifndef CONFIG_VIDEO_SAA717X
#ifdef CONFIG_VIDEO_SAA717X_MODULE
hw = ivtv_request_module(itv, hw, "saa717x", IVTV_HW_SAA717X);
#endif
#ifndef CONFIG_VIDEO_UPD64031A
#ifdef CONFIG_VIDEO_UPD64031A_MODULE
hw = ivtv_request_module(itv, hw, "upd64031a", IVTV_HW_UPD64031A);
#endif
#ifndef CONFIG_VIDEO_UPD64083
#ifdef CONFIG_VIDEO_UPD64083_MODULE
hw = ivtv_request_module(itv, hw, "upd64083", IVTV_HW_UPD6408X);
#endif
#ifndef CONFIG_VIDEO_MSP3400
#ifdef CONFIG_VIDEO_MSP3400_MODULE
hw = ivtv_request_module(itv, hw, "msp3400", IVTV_HW_MSP34XX);
#endif
#ifndef CONFIG_VIDEO_VP27SMPX
#ifdef CONFIG_VIDEO_VP27SMPX_MODULE
hw = ivtv_request_module(itv, hw, "vp27smpx", IVTV_HW_VP27SMPX);
#endif
#ifndef CONFIG_VIDEO_WM8775
#ifdef CONFIG_VIDEO_WM8775_MODULE
hw = ivtv_request_module(itv, hw, "wm8775", IVTV_HW_WM8775);
#endif
#ifndef CONFIG_VIDEO_WM8739
#ifdef CONFIG_VIDEO_WM8739_MODULE
hw = ivtv_request_module(itv, hw, "wm8739", IVTV_HW_WM8739);
#endif
#ifndef CONFIG_VIDEO_CS53L32A
#ifdef CONFIG_VIDEO_CS53L32A_MODULE
hw = ivtv_request_module(itv, hw, "cs53l32a", IVTV_HW_CS53L32A);
#endif
#ifndef CONFIG_VIDEO_M52790
#ifdef CONFIG_VIDEO_M52790_MODULE
hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790);
#endif
#endif