diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:06:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-07 19:06:13 -0700 |
| commit | 710ad849ae76bc2f938a885e928b90cdbbe61a6e (patch) | |
| tree | 28d53ccd6cf3888453fb7e588f5c62edcc595f69 /drivers/staging/rtl8192su/ieee80211/ieee80211.h | |
| parent | b32b8e645ea764620ececc0c9a66a7fc08536d4d (diff) | |
| parent | 749d00dbf154fc2f9ac59df669205039de0d5b45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: rspiusb: Fix buffer overflow
staging: add dependencies on PCI for drivers that require it
Staging: rtl8192su: fix build error
Staging: rt2870: Revert d44ca7 Removal of kernel_thread() API
Staging: rt2870: Add USB ID for Linksys, Planex Communications, Belkin
Diffstat (limited to 'drivers/staging/rtl8192su/ieee80211/ieee80211.h')
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211.h b/drivers/staging/rtl8192su/ieee80211/ieee80211.h index 720bfcbfadc..5e3a2cbed2b 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211.h @@ -2645,7 +2645,7 @@ extern int ieee80211_encrypt_fragment( struct sk_buff *frag, int hdr_len); -extern int ieee80211_xmit(struct sk_buff *skb, +extern int rtl8192_ieee80211_xmit(struct sk_buff *skb, struct net_device *dev); extern void ieee80211_txb_free(struct ieee80211_txb *); |