[PATCH, RESEND] libertas: unify various CF-related defines

[Dan Williams]

On Mon, 2008-06-02 at 20:57 -0400, John W. Linville wrote:
> On Mon, Jun 02, 2008 at 09:25:05AM +0200, Holger Schurig wrote:
> > Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
> > 
> > ---
> > 
> > John, this patch applies successfully for me on top of
> > wireless-testing v2.6.26-rc4-8765-g24e3ad4.
> 
> Yes, but then I get this:
> 
>   CC [M]  drivers/net/wireless/libertas/if_usb.o
> drivers/net/wireless/libertas/if_usb.c: In function ‘if_usb_reset_olpc_card’:
> drivers/net/wireless/libertas/if_usb.c:158: warning: no return statement in function returning non-void
> drivers/net/wireless/libertas/if_usb.c: In function ‘if_usb_probe’:
> drivers/net/wireless/libertas/if_usb.c:248: warning: assignment from incompatible pointer type
> 
> Are we out of sync?

Holger's patch shouldn't touch if_usb.c at all; these errors would be
the OLPC reset card patch that Woodhouse posted a week or two back most
likely.

dan