From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, mchehab@infradead.org
Cc: linux-kernel@vger.kernel.org, v4l-dvb-maintainer@linuxtv.org
Subject: [-mm patch] DVB: fix compile error
Date: Thu, 28 Dec 2006 16:26:07 +0100 [thread overview]
Message-ID: <20061228152607.GC20714@stusta.de> (raw)
In-Reply-To: <20061228024237.375a482f.akpm@osdl.org>
On Thu, Dec 28, 2006 at 02:42:37AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc1-mm1:
>...
> git-dvb.patch
>...
> git trees
>...
This patch fixes the following compile error:
<-- snip -->
...
LD drivers/media/video/built-in.o
drivers/media/video/saa7134/built-in.o:(.data+0x85ec): multiple definition of `ir_rc5_remote_gap'
drivers/media/video/bt8xx/built-in.o:(.data+0x734c): first defined here
drivers/media/video/saa7134/built-in.o:(.data+0x85f0): multiple definition of `ir_rc5_key_timeout'
drivers/media/video/bt8xx/built-in.o:(.data+0x7350): first defined here
make[4]: *** [drivers/media/video/built-in.o] Error 1
<-- snip -->
Since this variables were needlessly global, this patch implements the
trivial fix of making them static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/media/video/bt8xx/bttv-input.c | 4 ++--
drivers/media/video/saa7134/saa7134-input.c | 4 ++--
include/media/ir-common.h | 3 ---
3 files changed, 4 insertions(+), 7 deletions(-)
--- linux-2.6.20-rc2-mm1/include/media/ir-common.h.old 2006-12-28 12:54:05.000000000 +0100
+++ linux-2.6.20-rc2-mm1/include/media/ir-common.h 2006-12-28 12:54:39.000000000 +0100
@@ -36,9 +36,6 @@
#define IR_KEYCODE(tab,code) (((unsigned)code < IR_KEYTAB_SIZE) \
? tab[code] : KEY_RESERVED)
-extern int ir_rc5_remote_gap;
-extern int ir_rc5_key_timeout;
-
#define RC5_START(x) (((x)>>12)&3)
#define RC5_TOGGLE(x) (((x)>>11)&1)
#define RC5_ADDR(x) (((x)>>6)&31)
--- linux-2.6.20-rc2-mm1/drivers/media/video/saa7134/saa7134-input.c.old 2006-12-28 12:54:48.000000000 +0100
+++ linux-2.6.20-rc2-mm1/drivers/media/video/saa7134/saa7134-input.c 2006-12-28 12:55:00.000000000 +0100
@@ -41,9 +41,9 @@
module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */
MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
-int ir_rc5_remote_gap = 885;
+static int ir_rc5_remote_gap = 885;
module_param(ir_rc5_remote_gap, int, 0644);
-int ir_rc5_key_timeout = 115;
+static int ir_rc5_key_timeout = 115;
module_param(ir_rc5_key_timeout, int, 0644);
#define dprintk(fmt, arg...) if (ir_debug) \
--- linux-2.6.20-rc2-mm1/drivers/media/video/bt8xx/bttv-input.c.old 2006-12-28 12:55:08.000000000 +0100
+++ linux-2.6.20-rc2-mm1/drivers/media/video/bt8xx/bttv-input.c 2006-12-28 12:55:17.000000000 +0100
@@ -36,9 +36,9 @@
static int repeat_period = 33;
module_param(repeat_period, int, 0644);
-int ir_rc5_remote_gap = 885;
+static int ir_rc5_remote_gap = 885;
module_param(ir_rc5_remote_gap, int, 0644);
-int ir_rc5_key_timeout = 200;
+static int ir_rc5_key_timeout = 200;
module_param(ir_rc5_key_timeout, int, 0644);
#define DEVNAME "bttv-input"
next prev parent reply other threads:[~2006-12-28 15:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-28 10:42 2.6.20-rc2-mm1 Andrew Morton
2006-12-28 15:26 ` Adrian Bunk [this message]
2006-12-28 21:25 ` 2.6.20-rc2-mm1: INFO: possible recursive locking detected in con_close Laurent Riffard
2006-12-29 11:00 ` Frederik Deweerdt
2006-12-29 13:06 ` Laurent Riffard
2007-01-05 1:10 ` Greg KH
2007-01-05 10:57 ` Frederik Deweerdt
2006-12-29 0:36 ` 2.6.20-rc2-mm1: i386-idle-notifier again Adrian Bunk
2006-12-29 2:10 ` [-mm patch] infiniband/ulp/ipoib/ipoib_cm.c: make functions static Adrian Bunk
2006-12-29 5:39 ` Michael S. Tsirkin
2006-12-29 2:10 ` [-mm patch] make usbvision_rvfree() static Adrian Bunk
2006-12-29 2:10 ` [-mm patch] drivers/mtd/ubi/vtbl.c: make 2 functions static Adrian Bunk
2006-12-29 2:10 ` Adrian Bunk
2006-12-29 11:05 ` [-mm patch] add KM_SKB_DATA_SOFTIRQ to kmap_atomic debugging Frederik Deweerdt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061228152607.GC20714@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=v4l-dvb-maintainer@linuxtv.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.