[BUILDFIX PATCH] v4l/dvb: add statics to avoid multiple definitions

[BUILDFIX PATCH] v4l/dvb: add statics to avoid multiple definitions

[Harvey Harrison]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 drivers/media/dvb/dvb-usb/dib0700_devices.c |    4 ++--
 drivers/media/video/cx23885/cx23885-dvb.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 6477fc6..3462238 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -299,7 +299,7 @@ static int stk7700d_tuner_attach(struct dvb_usb_adapter *adap)
 }
 
 /* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
-struct dibx000_agc_config xc3028_agc_config = {
+static struct dibx000_agc_config xc3028_agc_config = {
 	BAND_VHF | BAND_UHF,       /* band_caps */
 
 	/* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0,
@@ -342,7 +342,7 @@ struct dibx000_agc_config xc3028_agc_config = {
 };
 
 /* PLL Configuration for COFDM BW_MHz = 8.00 with external clock = 30.00 */
-struct dibx000_bandwidth_config xc3028_bw_config = {
+static struct dibx000_bandwidth_config xc3028_bw_config = {
 	60000, 30000, /* internal, sampling */
 	1, 8, 3, 1, 0, /* pll_cfg: prediv, ratio, range, reset, bypass */
 	0, 0, 1, 1, 0, /* misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc,
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 870d6e1..f056497 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -191,7 +191,7 @@ static struct tda18271_config hauppauge_hvr1200_tuner_config = {
 	.gate    = TDA18271_GATE_ANALOG,
 };
 
-struct dibx000_agc_config xc3028_agc_config = {
+static struct dibx000_agc_config xc3028_agc_config = {
 	BAND_VHF | BAND_UHF,	/* band_caps */
 
 	/* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0,
@@ -237,7 +237,7 @@ struct dibx000_agc_config xc3028_agc_config = {
 
 /* PLL Configuration for COFDM BW_MHz = 8.000000
  * With external clock = 30.000000 */
-struct dibx000_bandwidth_config xc3028_bw_config = {
+static struct dibx000_bandwidth_config xc3028_bw_config = {
 	60000,	/* internal */
 	30000,	/* sampling */
 	1,	/* pll_cfg: prediv */
-- 
1.5.5.1.270.g89765

Re: [BUILDFIX PATCH] v4l/dvb: add statics to avoid multiple definitions

[Adrian Bunk]

I'm wondering what I am doing wrong since I already sent the same patch 
and it went not into Linus' tree.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [BUILDFIX PATCH] v4l/dvb: add statics to avoid multiple definitions

[Mauro Carvalho Chehab]

On Sat, 26 Apr 2008 13:01:30 +0300
Adrian Bunk <bunk@kernel.org> wrote:

> I'm wondering what I am doing wrong since I already sent the same patch 
> and it went not into Linus' tree.

>From my side I needed to re-generate my local -git copy, since I have two hunks
from one patch moved to another patch (sigh!). 

Although all tests I did here pointed to a broken tree, likely caused by stgit,
I felt the need of reviewing my environment, before sending more patches to
mainstream, to avoid further issues. I've scheduled your patches with top
priority, but I didn't forwarded any patches yet.

I was intending to do this on this Sat, since I would have more time for the
checks I want to do.

Sorry for the inconvenience.

Cheers,
Mauro

Re: [BUILDFIX PATCH] v4l/dvb: add statics to avoid multiple definitions

[Linus Torvalds]

On Sat, 26 Apr 2008, Adrian Bunk wrote:
>
> I'm wondering what I am doing wrong since I already sent the same patch 
> and it went not into Linus' tree.

Why the hell are you even wondering?

You didn't send the patch to me. It's that damn simple. Harvey did.

I do *not* troll the internet for random patches to apply. But I do apply 
random patches that fix build errors etc, WHEN THEY ARE SENT TO ME.

That said, I'm not asking people to send patches directly to me when there 
is a maintainer that can handle it, but obviously when people do send 
obvious patches that I feel comfy applying and make sense to apply, I'll 
do so.

In other words, don't send cleanup patches to me when there is a 
maintainer, but if there is a build fix or an oops/security fix that you 
want to go into my tree asap, feel free to short-circuit maintainership.

This should be neither new nor surprising to anybody.

			Linus