diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-05-24 17:17:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-24 17:17:11 -0400 |
| commit | c71cd01989b417317f4d22ccf4ce112859671b64 (patch) | |
| tree | 5447a67ba5ed686277db7dd3c95cadc2fb305090 /drivers/net/wireless/libertas/decl.h | |
| parent | efa5bf1dd2cf3cdee0bfe97cfd76ff2296179ae4 (diff) | |
| parent | 412e8a0ebf1a58c060cc76438e5b6d33789c5e20 (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/libertas/decl.h')
| -rw-r--r-- | drivers/net/wireless/libertas/decl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 606bdd002be7..dfe27642322c 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h | |||
| @@ -46,7 +46,7 @@ u32 libertas_index_to_data_rate(u8 index); | |||
| 46 | u8 libertas_data_rate_to_index(u32 rate); | 46 | u8 libertas_data_rate_to_index(u32 rate); |
| 47 | void libertas_get_fwversion(wlan_adapter * adapter, char *fwversion, int maxlen); | 47 | void libertas_get_fwversion(wlan_adapter * adapter, char *fwversion, int maxlen); |
| 48 | 48 | ||
| 49 | int libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb); | 49 | void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb); |
| 50 | 50 | ||
| 51 | /** The proc fs interface */ | 51 | /** The proc fs interface */ |
| 52 | int libertas_process_rx_command(wlan_private * priv); | 52 | int libertas_process_rx_command(wlan_private * priv); |