[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>

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);

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"
 

drivers/net/wireless/libertas/fw.h

-/**
-  * 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_ */

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"