diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 01:04:34 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 01:04:34 -0400 |
| commit | fc600432cd23e35c85de2ff4468d816d6938a112 (patch) | |
| tree | c191c51e4458ec31c1d8254f01e23b2e1574b6f4 /net/wireless/util.c | |
| parent | db61550931957ee6c7dba751662919424b4344f3 (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 26f8cd30f712..994e2f0cc7a8 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c | |||
| @@ -735,7 +735,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev) | |||
| 735 | wdev->connect_keys = NULL; | 735 | wdev->connect_keys = NULL; |
| 736 | } | 736 | } |
| 737 | 737 | ||
| 738 | static void cfg80211_process_wdev_events(struct wireless_dev *wdev) | 738 | void cfg80211_process_wdev_events(struct wireless_dev *wdev) |
| 739 | { | 739 | { |
| 740 | struct cfg80211_event *ev; | 740 | struct cfg80211_event *ev; |
| 741 | unsigned long flags; | 741 | unsigned long flags; |