[GIT PATCH] STAGING patches for .39

[Randy Dunlap]

On Wed, 16 Mar 2011 19:02:12 -0700 Greg KH wrote:

> On Wed, Mar 16, 2011 at 06:52:39PM -0700, Greg KH wrote:
> > On Wed, Mar 16, 2011 at 05:34:08PM -0700, Linus Torvalds wrote:
> > > On Wed, Mar 16, 2011 at 5:32 PM, Linus Torvalds
> > > <torvalds at linux-foundation.org> wrote:
> > > >
> > > > The one with inifinite errors was vt6655.
> > > 
> > > vt6656 had same/similar issues. In fact, maybe it's simply because I
> > > built both of them in, and get infinite "multiple definitions" because
> > > they are the same driver with small differences?
> > 
> > Ah, probably, if they are both built into the kernel that might happen
> > due to the global symbols in them.  Actually that's odd, Randy's usual
> > 'randconfig' tester usually catches these, I'll make the Kconfig files
> > force them to be modules to keep this from happening in the future.
> 
> Yes, that looks like the problem, as building them as modules in your
> tree right now works just fine.
> 
> This patch below should solve your build issue, let me know if it
> doesn't.

Thanks for the patch.  You had suggested 1-2 months ago that someone do
this, so I was waiting to see if someone would actually do it.
I was hoping that a staging developer would do it (not the staging
maintainer).


> thanks,
> 
> greg k-h
> 
> -----------------
> From: Greg Kroah-Hartman <gregkh at suse.de>
> Subject: staging: force vt6655 and vt6656 drivers to be built as modules
> 
> If they both get built into the kernel, the global symbols in them
> conflict and lots of link errors happen.
> 
> Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
> 
> 
> diff --git a/drivers/staging/vt6655/Kconfig b/drivers/staging/vt6655/Kconfig
> index 061e730..c3ba693 100644
> --- a/drivers/staging/vt6655/Kconfig
> +++ b/drivers/staging/vt6655/Kconfig
> @@ -1,6 +1,6 @@
>  config VT6655
>     tristate "VIA Technologies VT6655 support"
> -   depends on PCI && WLAN
> +   depends on PCI && WLAN && m
>     select WIRELESS_EXT
>     select WEXT_PRIV
>     ---help---
> diff --git a/drivers/staging/vt6656/Kconfig b/drivers/staging/vt6656/Kconfig
> index a441ba5..f89ab20 100644
> --- a/drivers/staging/vt6656/Kconfig
> +++ b/drivers/staging/vt6656/Kconfig
> @@ -1,6 +1,6 @@
>  config VT6656
>  	tristate "VIA Technologies VT6656 support"
> -	depends on USB && WLAN
> +	depends on USB && WLAN && m
>  	select WIRELESS_EXT
>  	select WEXT_PRIV
>  	select FW_LOADER

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***