[PATCH 11/25] UBUNTU hardy-lum lpia branch sync

[Steve Conklin]

>From e44eeadd4cc62486715fb152393e0779b8d8124a Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri, 6 Mar 2009 11:51:24 -0500
Subject: [PATCH] UBUNTU: siano: prevent duplicate variable declaration
 OriginalAuthor: Michael Krufky <mkrufky at linuxtv.org>
 OriginalLocation: http://linuxtv.org/hg/v4l-dvb/rev/eae32c526e78

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 at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
 ubuntu/media/sms1xxx/sms-cards.c  |    4 ++++
 ubuntu/media/sms1xxx/smscoreapi.c |    2 +-
 ubuntu/media/sms1xxx/smscoreapi.h |    2 --
 ubuntu/media/sms1xxx/smsdvb.c     |    2 +-
 ubuntu/media/sms1xxx/smsusb.c     |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ubuntu/media/sms1xxx/sms-cards.c b/ubuntu/media/sms1xxx/sms-cards.c
index fa33267..abb1c6b 100644
--- a/ubuntu/media/sms1xxx/sms-cards.c
+++ b/ubuntu/media/sms1xxx/sms-cards.c
@@ -19,6 +19,10 @@
 
 #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",
diff --git a/ubuntu/media/sms1xxx/smscoreapi.c b/ubuntu/media/sms1xxx/smscoreapi.c
index 812b57a..8c37a06 100644
--- a/ubuntu/media/sms1xxx/smscoreapi.c
+++ b/ubuntu/media/sms1xxx/smscoreapi.c
@@ -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))");
 
diff --git a/ubuntu/media/sms1xxx/smscoreapi.h b/ubuntu/media/sms1xxx/smscoreapi.h
index bb5f0eb..866ca0a 100644
--- a/ubuntu/media/sms1xxx/smscoreapi.h
+++ b/ubuntu/media/sms1xxx/smscoreapi.h
@@ -589,8 +589,6 @@ int smscore_led_state(struct smscore_device_t *core, int led);
 
 /* ------------------------------------------------------------------------ */
 
-extern int sms_dbg;
-
 #define DBG_INFO 1
 #define DBG_ADV  2
 
diff --git a/ubuntu/media/sms1xxx/smsdvb.c b/ubuntu/media/sms1xxx/smsdvb.c
index 436ffdc..4cbb16a 100644
--- a/ubuntu/media/sms1xxx/smsdvb.c
+++ b/ubuntu/media/sms1xxx/smsdvb.c
@@ -52,7 +52,7 @@ struct smsdvb_client_t {
 static struct list_head g_smsdvb_clients;
 static struct mutex g_smsdvb_clientslock;
 
-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))");
 
diff --git a/ubuntu/media/sms1xxx/smsusb.c b/ubuntu/media/sms1xxx/smsusb.c
index 74426a3..bedc5c1 100644
--- a/ubuntu/media/sms1xxx/smsusb.c
+++ b/ubuntu/media/sms1xxx/smsusb.c
@@ -27,7 +27,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))");
 
-- 
1.5.6.3