]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (10772): siano: prevent duplicate variable declaration
authorMichael Krufky <mkrufky@linuxtv.org>
Fri, 27 Feb 2009 05:42:16 +0000 (02:42 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:43:02 +0000 (12:43 -0300)
Fix the following build error:

drivers/media/dvb/siano/smsusb.o: In function `get_order':
include/asm-generic/page.h:10: multiple definition of `sms_dbg'
drivers/media/dvb/siano/sms1xxx.o:include/asm-generic/page.h:10: first defined here
drivers/media/dvb/siano/smsdvb.o: In function `get_order':
include/asm-generic/page.h:10: multiple definition of `sms_dbg'
drivers/media/dvb/siano/sms1xxx.o:include/asm-generic/page.h:10: first defined here

Thanks to Mauro Carvalho Chehab for his original patch to address this issue.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/siano/sms-cards.c
drivers/media/dvb/siano/smscoreapi.c
drivers/media/dvb/siano/smscoreapi.h
drivers/media/dvb/siano/smsdvb.c
drivers/media/dvb/siano/smsusb.c

index 66f591937ff59c927520bce4ba14af9376b90299..63e4d0ec6583e95010ab8db2a5e853a1b81c79fb 100644 (file)
 
 #include "sms-cards.h"
 
+static int sms_dbg;
+module_param_named(cards_dbg, sms_dbg, int, 0644);
+MODULE_PARM_DESC(cards_dbg, "set debug level (info=1, adv=2 (or-able))");
+
 static struct sms_board sms_boards[] = {
        [SMS_BOARD_UNKNOWN] = {
                .name   = "Unknown board",
index efa7a4192648ffe05fd07ebb5bf23a83a8c3a812..7bd4d1dee2b32022bf52ff5923b95f423bd81e45 100644 (file)
@@ -34,7 +34,7 @@
 #include "smscoreapi.h"
 #include "sms-cards.h"
 
-int sms_dbg;
+static int sms_dbg;
 module_param_named(debug, sms_dbg, int, 0644);
 MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
 
index e48cd1c98191c38da68009ec7f0c04cb7aa00a13..548de9056e8b97b0f567d9cbf948ecb10891b6cc 100644 (file)
@@ -422,8 +422,6 @@ int smscore_led_state(struct smscore_device_t *core, int led);
 
 /* ------------------------------------------------------------------------ */
 
-extern int sms_dbg;
-
 #define DBG_INFO 1
 #define DBG_ADV  2
 
index 36dc9f2d11723e87db61b48de256d55bc7aa7946..ba080b95befbf5cda1d3943a4d34eaeab5bf60ee 100644 (file)
@@ -50,6 +50,10 @@ struct smsdvb_client_t {
 static struct list_head g_smsdvb_clients;
 static struct mutex g_smsdvb_clientslock;
 
+static 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)
 {
        struct smsdvb_client_t *client = (struct smsdvb_client_t *) context;
index 5bb8261721b12fe6edc29040bbf1a2809fe3d515..71c65f544c072911cb326f8614097378448e2618 100644 (file)
 #include "smscoreapi.h"
 #include "sms-cards.h"
 
+static 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