diff options
| author | Henk de Groot <henk.de.groot@hetnet.nl> | 2010-05-13 16:27:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-14 13:47:07 -0700 |
| commit | 93822ad193f1b1d92422dc3d539456acbe1a85ef (patch) | |
| tree | b62e92f38a9801cfc4b507ddfc918cc8ac4580b2 /drivers/staging/wlags49_h2/wl_internal.h | |
| parent | 97a0638218fc504d645c45ff03256dc4520efa72 (diff) | |
Staging: wlags49_hs2: Fix wlags49_hs2 driver after build fixes broke it
Fixes the driver after merge into the 2.6.34 kernel. Driver should
be functional again (a fix to make it compile broke the driver).
Patch against 2.6.34 RC7 with patch-v2.6.34-rc7-next-20100513
already applied.
Removed conditional code based on kernel version, this is pointless
now the driver is part of the kernel. Also removed obsolte code
left over from previous patches. Includes also small fixes to compile
clean again.
Signed-off-by: Henk de Groot <pe1dnn@amsat.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_internal.h')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_internal.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h index 466fb6215acd..d9a0ad039c19 100644 --- a/drivers/staging/wlags49_h2/wl_internal.h +++ b/drivers/staging/wlags49_h2/wl_internal.h @@ -69,9 +69,6 @@ ******************************************************************************/ #include <linux/version.h> #ifdef BUS_PCMCIA -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) -#include <pcmcia/version.h> -#endif #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> @@ -866,7 +863,6 @@ struct wl_private { #ifdef BUS_PCMCIA - dev_node_t node; struct pcmcia_device *link; #endif // BUS_PCMCIA @@ -1013,13 +1009,13 @@ extern inline struct wl_private *wl_priv(struct net_device *dev) * SPARC, due to its weird semantics for save/restore flags. extern * inline should prevent the kernel from linking or module from * loading if they are not inlined. */ -extern inline void wl_lock(struct wl_private *lp, +static inline void wl_lock(struct wl_private *lp, unsigned long *flags) { spin_lock_irqsave(&lp->slock, *flags); } -extern inline void wl_unlock(struct wl_private *lp, +static inline void wl_unlock(struct wl_private *lp, unsigned long *flags) { spin_unlock_irqrestore(&lp->slock, *flags); |