aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-05-01 08:34:54 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 01:54:09 -0400
commit6a4a79355bfa9ae6977556595a68f2e3a0e143f7 (patch)
tree63955ce42d873cb9b21e467b7a91a670b2f4f80a /drivers/media/video/cx18
parentfeb5bce24ed4d90c0a5710a669072c778a2c5148 (diff)
V4L/DVB (7853): ivtv/cx18: fix compile warnings
Fix compile warnings if MODULE is not defined. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r--drivers/media/video/cx18/cx18-driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 3f55d47bc4b9..7813380dce3f 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -548,6 +548,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
548 return 0; 548 return 0;
549} 549}
550 550
551#ifdef MODULE
551static u32 cx18_request_module(struct cx18 *cx, u32 hw, 552static u32 cx18_request_module(struct cx18 *cx, u32 hw,
552 const char *name, u32 id) 553 const char *name, u32 id)
553{ 554{
@@ -560,12 +561,14 @@ static u32 cx18_request_module(struct cx18 *cx, u32 hw,
560 CX18_DEBUG_INFO("Loaded module %s\n", name); 561 CX18_DEBUG_INFO("Loaded module %s\n", name);
561 return hw; 562 return hw;
562} 563}
564#endif
563 565
564static void cx18_load_and_init_modules(struct cx18 *cx) 566static void cx18_load_and_init_modules(struct cx18 *cx)
565{ 567{
566 u32 hw = cx->card->hw_all; 568 u32 hw = cx->card->hw_all;
567 int i; 569 int i;
568 570
571#ifdef MODULE
569 /* load modules */ 572 /* load modules */
570#ifndef CONFIG_MEDIA_TUNER 573#ifndef CONFIG_MEDIA_TUNER
571 hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); 574 hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
@@ -573,6 +576,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
573#ifndef CONFIG_VIDEO_CS5345 576#ifndef CONFIG_VIDEO_CS5345
574 hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345); 577 hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
575#endif 578#endif
579#endif
576 580
577 /* check which i2c devices are actually found */ 581 /* check which i2c devices are actually found */
578 for (i = 0; i < 32; i++) { 582 for (i = 0; i < 32; i++) {