diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/net/wireless/airo_cs.c | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 784de9109113..96ed8da8661d 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -42,6 +42,8 @@ | |||
42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
44 | 44 | ||
45 | #include "airo.h" | ||
46 | |||
45 | /* | 47 | /* |
46 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | 48 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If |
47 | you do not define PCMCIA_DEBUG at all, all the debug code will be | 49 | you do not define PCMCIA_DEBUG at all, all the debug code will be |
@@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards"); | |||
78 | event handler. | 80 | event handler. |
79 | */ | 81 | */ |
80 | 82 | ||
81 | struct net_device *init_airo_card( int, int, int, struct device * ); | ||
82 | void stop_airo_card( struct net_device *, int ); | ||
83 | int reset_airo_card( struct net_device * ); | ||
84 | |||
85 | static void airo_config(dev_link_t *link); | 83 | static void airo_config(dev_link_t *link); |
86 | static void airo_release(dev_link_t *link); | 84 | static void airo_release(dev_link_t *link); |
87 | static int airo_event(event_t event, int priority, | 85 | static int airo_event(event_t event, int priority, |