diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:50:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:50:55 -0500 |
| commit | 0b310f36d7d96e27f6941ec0f9b95e15142f1e78 (patch) | |
| tree | c2a3d403c82fd892ded3849cc721cf8e6f8c7824 /drivers/net/wireless/netwave_cs.c | |
| parent | 359b8800d3a46557844969c485e1a14baf119b06 (diff) | |
| parent | 2f633db5e9c57e07a971b65e9a72f090f59fd5f6 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/netwave_cs.c')
| -rw-r--r-- | drivers/net/wireless/netwave_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index bf6271ee387a..75ce6ddb0cf5 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c @@ -55,10 +55,8 @@ #include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/bitops.h> -#ifdef CONFIG_NET_RADIO #include <linux/wireless.h> #include <net/iw_handler.h> -#endif #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> |