[Acx100-devel] [PATCH 06/14] pci.h: drop acxpci_upload_fw() prototypes

[Jim C. <jim...@gm...>]

This function was moved to merge.c, so its prototype is determined by
both MEM and PCI.  This makes it fit better in merge.h than pci.h.  As
it turns out, we dont need a prototype at all (its only called from
within merge.c, but the current prototype is wrong in a USB-only
config, so just drop it.

Signed-off-by: Jim Cromie <jim...@gm...>
---
 pci.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pci.h b/pci.h
index 71a2f26..8a71471 100644
--- a/pci.h
+++ b/pci.h
@@ -53,12 +53,10 @@ void acxpci_write_cmd_type_status(acx_device_t *adev, u16 type,
 #if defined(CONFIG_ACX_MAC80211_PCI)
 
 void acxpci_reset_mac(acx_device_t *adev);
-int acxpci_upload_fw(acx_device_t *adev);
 
 #else /* !CONFIG_ACX_MAC80211_PCI */
 
-static inline void acxpci_reset_mac(acx_device_t *adev)
-{}
+static inline void acxpci_reset_mac(acx_device_t *adev) {}
 
 #endif /* CONFIG_ACX_MAC80211_PCI */
 #endif /* _PCI_H_ */
-- 
1.7.10.1.487.ga3935e6