Commit 0d02efe4 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

V4L/DVB (10772): siano: prevent duplicate variable declaration

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: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9b76ede4
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
#include "sms-cards.h" #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[] = { static struct sms_board sms_boards[] = {
[SMS_BOARD_UNKNOWN] = { [SMS_BOARD_UNKNOWN] = {
.name = "Unknown board", .name = "Unknown board",
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "smscoreapi.h" #include "smscoreapi.h"
#include "sms-cards.h" #include "sms-cards.h"
int sms_dbg; static int sms_dbg;
module_param_named(debug, sms_dbg, int, 0644); module_param_named(debug, sms_dbg, int, 0644);
MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))"); MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
......
...@@ -422,8 +422,6 @@ int smscore_led_state(struct smscore_device_t *core, int led); ...@@ -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_INFO 1
#define DBG_ADV 2 #define DBG_ADV 2
......
...@@ -50,6 +50,10 @@ struct smsdvb_client_t { ...@@ -50,6 +50,10 @@ struct smsdvb_client_t {
static struct list_head g_smsdvb_clients; static struct list_head g_smsdvb_clients;
static struct mutex g_smsdvb_clientslock; 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) static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
{ {
struct smsdvb_client_t *client = (struct smsdvb_client_t *) context; struct smsdvb_client_t *client = (struct smsdvb_client_t *) context;
......
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
#include "smscoreapi.h" #include "smscoreapi.h"
#include "sms-cards.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 USB1_BUFFER_SIZE 0x1000
#define USB2_BUFFER_SIZE 0x4000 #define USB2_BUFFER_SIZE 0x4000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment