Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[mv-sheeva.git] / drivers / staging / wlan-ng / p80211conv.h

diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index 6fe163be24f624dc8b698aea2e0b4583798c6483..0c62df19fa7ffa3ee547f23b0c78927bd7f9811a 100644 (file)
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -153,8 +153,8 @@ struct wlandevice;
 int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
                        struct sk_buff *skb);
 int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,
-                       struct sk_buff *skb, p80211_hdr_t *p80211_hdr,
-                       p80211_metawep_t *p80211_wep);
+                       struct sk_buff *skb, p80211_hdr_t * p80211_hdr,
+                       p80211_metawep_t * p80211_wep);
 
 int p80211_stt_findproto(u16 proto);