[PATCH] libertas: fix link errors (bz# 9077)

[PATCH] libertas: fix link errors (bz# 9077)

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix missing symbols in libertas USB driver when it is modular and rest
of libertas is built-in.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/net/wireless/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.23-rc8.orig/drivers/net/wireless/Makefile
+++ linux-2.6.23-rc8/drivers/net/wireless/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
-obj-$(CONFIG_LIBERTAS_USB)     += libertas/
+obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 rtl8187-objs		:= rtl8187_dev.o rtl8187_rtl8225.o
 obj-$(CONFIG_RTL8187)	+= rtl8187.o

Re: [PATCH] libertas: fix link errors (bz# 9077)

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]

On Thu, 2007-09-27 at 10:17 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix missing symbols in libertas USB driver when it is modular and rest
> of libertas is built-in.

Ohhh. Thanks Randy, I stared at this problem for a while and never
noticed that it said _USB there.

> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
>  drivers/net/wireless/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-2.6.23-rc8.orig/drivers/net/wireless/Makefile
> +++ linux-2.6.23-rc8/drivers/net/wireless/Makefile
> @@ -43,7 +43,7 @@ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
>  obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
>  
>  obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
> -obj-$(CONFIG_LIBERTAS_USB)     += libertas/
> +obj-$(CONFIG_LIBERTAS)		+= libertas/
>  
>  rtl8187-objs		:= rtl8187_dev.o rtl8187_rtl8225.o
>  obj-$(CONFIG_RTL8187)	+= rtl8187.o
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

Re: [PATCH] libertas: fix link errors (bz# 9077)

[John W. Linville]

On Thu, Sep 27, 2007 at 07:47:43PM +0200, Johannes Berg wrote:
> On Thu, 2007-09-27 at 10:17 -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > Fix missing symbols in libertas USB driver when it is modular and rest
> > of libertas is built-in.
> 
> Ohhh. Thanks Randy, I stared at this problem for a while and never
> noticed that it said _USB there.

FWIW, the equivalent change seems to already be in net-2.6.24.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH] libertas: fix link errors (bz# 9077)

[Dan Williams]

On Thu, 2007-09-27 at 16:36 -0400, John W. Linville wrote:
> On Thu, Sep 27, 2007 at 07:47:43PM +0200, Johannes Berg wrote:
> > On Thu, 2007-09-27 at 10:17 -0700, Randy Dunlap wrote:
> > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > 
> > > Fix missing symbols in libertas USB driver when it is modular and rest
> > > of libertas is built-in.
> > 
> > Ohhh. Thanks Randy, I stared at this problem for a while and never
> > noticed that it said _USB there.
> 
> FWIW, the equivalent change seems to already be in net-2.6.24.

I 100% certain this was fixed in libertas-2.6 months ago, but my hunch
is that it got blown away when I rebased the 70-odd libertas-2.6 patches
on top of 2.6.23 to send to linville for the 2.6.24 cycle.  That section
specifically conflicted with the addition of the zd1211 driver's config
variable.  Yay for merging, sorry...

Dan