diff options
| author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-05-25 12:18:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:39 -0400 |
| commit | ed457037c5e8287a3fd24408250fb396b57b9a1b (patch) | |
| tree | 065243fb5d909f501cfea3f17cf69f9dad342782 | |
| parent | 208fdd2f447899164bd139452c291b155e53cee9 (diff) | |
[PATCH] libertas: move contents of fw.h to decl.h
Also removes some useless "extern" declarations from function declaration.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/libertas/decl.h | 9 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/fw.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/fw.h | 9 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 1 |
4 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 4967005adfef..8b34336ff3db 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h @@ -66,15 +66,18 @@ void libertas_ps_wakeup(wlan_private * priv, int wait_option); void libertas_tx_runqueue(wlan_private *priv); -extern struct chan_freq_power *libertas_find_cfp_by_band_and_channel( +struct chan_freq_power *libertas_find_cfp_by_band_and_channel( wlan_adapter * adapter, u8 band, u16 channel); -extern void libertas_mac_event_disconnected(wlan_private * priv); +void libertas_mac_event_disconnected(wlan_private * priv); void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str); +/* fw.c */ +int libertas_init_fw(wlan_private * priv); + /* main.c */ -extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, +struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *cfp_no); wlan_private *wlan_add_card(void *card); int libertas_activate_card(wlan_private *priv); diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c index dc3d48aefd68..aa63a967635e 100644 --- a/drivers/net/wireless/libertas/fw.c +++ b/drivers/net/wireless/libertas/fw.c @@ -8,7 +8,6 @@ #include "defs.h" #include "decl.h" #include "dev.h" -#include "fw.h" #include "wext.h" #include "if_usb.h" diff --git a/drivers/net/wireless/libertas/fw.h b/drivers/net/wireless/libertas/fw.h deleted file mode 100644 index e5a6a2b076e3..000000000000 --- a/drivers/net/wireless/libertas/fw.h +++ /dev/null @@ -1,9 +0,0 @@ -/** - * This header file contains FW interface related definitions. - */ -#ifndef _WLAN_FW_H_ -#define _WLAN_FW_H_ - -int libertas_init_fw(wlan_private * priv); - -#endif /* _WLAN_FW_H_ */ diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 33294dd0eeec..c9d155ce98a0 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -17,7 +17,6 @@ #include "host.h" #include "decl.h" #include "dev.h" -#include "fw.h" #include "wext.h" #include "debugfs.h" #include "assoc.h" |