diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:46:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:46:13 -0400 |
| commit | a513c315f95c6d73041436fd1598d51722bd6264 (patch) | |
| tree | 505f9a15c1771756cf21011e3f291b81c86cb3df /drivers/net/wireless/ray_cs.c | |
| parent | fd6746daade513bf7f887625c107878b6aacccfd (diff) | |
| parent | 113b898e38cb20e80847c24154ce62273b948c6a (diff) | |
| download | blackbird-op-linux-a513c315f95c6d73041436fd1598d51722bd6264.tar.gz blackbird-op-linux-a513c315f95c6d73041436fd1598d51722bd6264.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 61b83a5e737a..8e112d139e29 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -52,8 +52,8 @@ #include <pcmcia/ds.h> #include <pcmcia/mem_op.h> -#include <net/ieee80211.h> #include <linux/wireless.h> +#include <net/iw_handler.h> #include <asm/io.h> #include <asm/system.h> |
