UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Krufky 2009-02-27 02:42:16 -03:00 committed by Mauro Carvalho Chehab
parent 9b76ede411
commit 0d02efe486
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/dvb/siano/sms-cards.c
View File

@ -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",

2
drivers/media/dvb/siano/smscoreapi.c
View File

@ -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))");

2
drivers/media/dvb/siano/smscoreapi.h
View 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_INFO 1
#define DBG_ADV 2 #define DBG_ADV 2

4
drivers/media/dvb/siano/smsdvb.c
View File

@ -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;

4
drivers/media/dvb/siano/smsusb.c
View File

@ -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