The patch number 10767 was added via Mauro Carvalho Chehab <mche...@redhat.com>
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:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
siano: Remove duplicated var declaration
The same var were declared into three different modules:
drivers/media/dvb/siano/smsusb.o: In function `get_order':
/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10: multiple definition
of `sms_dbg'
drivers/media/dvb/siano/sms1xxx.o:/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10:
first defined here
drivers/media/dvb/siano/smsdvb.o: In function `get_order':
/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10: multiple definition
of `sms_dbg'
drivers/media/dvb/siano/sms1xxx.o:/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10:
first defined here
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/dvb/siano/smsdvb.c | 4 ----
linux/drivers/media/dvb/siano/smsusb.c | 4 ----
2 files changed, 8 deletions(-)
diff -r 5fb7c4aeefe4 -r 85a2b117175e linux/drivers/media/dvb/siano/smsdvb.c
--- a/linux/drivers/media/dvb/siano/smsdvb.c Thu Feb 26 22:23:37 2009 -0300
+++ b/linux/drivers/media/dvb/siano/smsdvb.c Fri Feb 27 00:06:40 2009 -0300
@@ -49,10 +49,6 @@ struct smsdvb_client_t {
static struct list_head g_smsdvb_clients;
static struct mutex g_smsdvb_clientslock;
-
-int sms_dbg;
-module_param_named(debug, sms_dbg, int, 0644);
-MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
{
diff -r 5fb7c4aeefe4 -r 85a2b117175e linux/drivers/media/dvb/siano/smsusb.c
--- a/linux/drivers/media/dvb/siano/smsusb.c Thu Feb 26 22:23:37 2009 -0300
+++ b/linux/drivers/media/dvb/siano/smsusb.c Fri Feb 27 00:06:40 2009 -0300
@@ -26,10 +26,6 @@
#include "smscoreapi.h"
#include "sms-cards.h"
-
-int sms_dbg;
-module_param_named(debug, sms_dbg, int, 0644);
-MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
#define USB1_BUFFER_SIZE 0x1000
#define USB2_BUFFER_SIZE 0x4000
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/85a2b117175ef94b6ca712bbe11eaadca99acf8c
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
