From: Harry Wei <jiaweiwei.xiyou@gmail.com>
Date: Thu, 28 Apr 2011 01:30:01 +0000 (+0800)
Subject: staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c
X-Git-Tag: upstream/snapshot3+hdmi~10514^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9005fcd89c24f2a0fa6f87588b9208aae6d4d6cd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c

Hi us,
   When i was compiling kernel, a warning happened to me.
The warning said like following.

drivers/staging/wlan-ng/cfg80211.c:709: warning: initialization from
incompatible pointer type.

See http://s1202.photobucket.com/albums/bb364/harrywei/?action=view&current=patched2.png
for more details.

So i patch like following.

Signed-off-by: Harry Wei <harryxiyou@gmail.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 6a71f52..7637839 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -273,7 +273,7 @@ exit:
 }
 
 int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
-			   u8 key_index)
+			   u8 key_index, bool unicast, bool multicast)
 {
 	wlandevice_t *wlandev = dev->ml_priv;