The patch number 7853 was added via Hans Verkuil <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Hans Verkuil <[EMAIL PROTECTED]>
ivtv/cx18: fix compile warnings
Fix compile warnings if MODULE is not defined.
Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx18/cx18-driver.c | 4 ++++
linux/drivers/media/video/ivtv/ivtv-driver.c | 4 ++++
2 files changed, 8 insertions(+)
diff -r 583acbd6db65 -r d49c5b97c83f
linux/drivers/media/video/cx18/cx18-driver.c
--- a/linux/drivers/media/video/cx18/cx18-driver.c Thu May 01 11:22:13
2008 +0200
+++ b/linux/drivers/media/video/cx18/cx18-driver.c Thu May 01 11:34:54
2008 +0200
@@ -548,6 +548,7 @@ static int cx18_setup_pci(struct cx18 *c
return 0;
}
+#ifdef MODULE
static u32 cx18_request_module(struct cx18 *cx, u32 hw,
const char *name, u32 id)
{
@@ -560,18 +561,21 @@ static u32 cx18_request_module(struct cx
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);
#endif
#ifndef CONFIG_VIDEO_CS5345
hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
+#endif
#endif
/* check which i2c devices are actually found */
diff -r 583acbd6db65 -r d49c5b97c83f
linux/drivers/media/video/ivtv/ivtv-driver.c
--- a/linux/drivers/media/video/ivtv/ivtv-driver.c Thu May 01 11:22:13
2008 +0200
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.c Thu May 01 11:34:54
2008 +0200
@@ -857,6 +857,7 @@ static int ivtv_setup_pci(struct ivtv *i
return 0;
}
+#ifdef MODULE
static u32 ivtv_request_module(struct ivtv *itv, u32 hw,
const char *name, u32 id)
{
@@ -869,12 +870,14 @@ static u32 ivtv_request_module(struct iv
IVTV_DEBUG_INFO("Loaded module %s\n", name);
return hw;
}
+#endif
static void ivtv_load_and_init_modules(struct ivtv *itv)
{
u32 hw = itv->card->hw_all;
unsigned i;
+#ifdef MODULE
/* load modules */
#ifndef CONFIG_MEDIA_TUNER
hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER);
@@ -914,6 +917,7 @@ static void ivtv_load_and_init_modules(s
#endif
#ifndef CONFIG_VIDEO_M52790
hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790);
+#endif
#endif
/* check which i2c devices are actually found */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d49c5b97c83fdedf8ba66cd914a93cf29018ee5a
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
