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_wext.c | |
| parent | Staging: ramzswap: Remove backing swap support (diff) | |
| download | linux-dev-93822ad193f1b1d92422dc3d539456acbe1a85ef.tar.xz linux-dev-93822ad193f1b1d92422dc3d539456acbe1a85ef.zip | |
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_wext.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_wext.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 311d3c5a2ef0..06467f1bf901 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -82,17 +82,10 @@ in the build. */ #ifdef WIRELESS_EXT -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) -#define IWE_STREAM_ADD_EVENT(info, buf, end, iwe, len) \ - iwe_stream_add_event(buf, end, iwe, len) -#define IWE_STREAM_ADD_POINT(info, buf, end, iwe, msg) \ - iwe_stream_add_point(buf, end, iwe, msg) -#else #define IWE_STREAM_ADD_EVENT(info, buf, end, iwe, len) \ iwe_stream_add_event(info, buf, end, iwe, len) #define IWE_STREAM_ADD_POINT(info, buf, end, iwe, msg) \ iwe_stream_add_point(info, buf, end, iwe, msg) -#endif |