summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-05-01 11:34:54 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-05-01 11:34:54 +0200
commit778ea1f1dd0cb7da18e5e0258f9c443f8debafe4 (patch)
tree29cf9f43637121f4d2a9449fd511a4ec094f4fd3 /linux/drivers/media/video/cx18
parent93c8d513a3fc829c1f340235756df7a3e13dedfa (diff)
downloadmediapointer-dvb-s2-778ea1f1dd0cb7da18e5e0258f9c443f8debafe4.tar.gz
mediapointer-dvb-s2-778ea1f1dd0cb7da18e5e0258f9c443f8debafe4.tar.bz2
ivtv/cx18: fix compile warnings
From: Hans Verkuil <hverkuil@xs4all.nl> Fix compile warnings if MODULE is not defined. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx18')
-rw-r--r--linux/drivers/media/video/cx18/cx18-driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c
index 8f5ed9b4b..421e005d0 100644
--- a/linux/drivers/media/video/cx18/cx18-driver.c
+++ b/linux/drivers/media/video/cx18/cx18-driver.c
@@ -548,6 +548,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
return 0;
}
+#ifdef MODULE
static u32 cx18_request_module(struct cx18 *cx, u32 hw,
const char *name, u32 id)
{
@@ -560,12 +561,14 @@ static u32 cx18_request_module(struct cx18 *cx, u32 hw,
CX18_DEBUG_INFO("Loaded module %s\n", name);
return hw;
}
+#endif
static void cx18_load_and_init_modules(struct cx18 *cx)
{
u32 hw = cx->card->hw_all;
int i;
+#ifdef MODULE
/* load modules */
#ifndef CONFIG_MEDIA_TUNER
hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
@@ -573,6 +576,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
#ifndef CONFIG_VIDEO_CS5345
hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
#endif
+#endif
/* check which i2c devices are actually found */
for (i = 0; i < 32; i++) {