git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
rtl8192su
/
ieee80211
/
ieee80211_crypt.c
diff --git
a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c
b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c
index 8019423394379d4c1d947e9192adb0863108fbd7..24e7d595e3cef80c7f9e9d0b94022f63b27f1bea 100644
(file)
--- a/
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c
+++ b/
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c
@@
-11,7
+11,6
@@
*
*/
*
*/
-//#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-201,7
+200,7
@@
static struct ieee80211_crypto_ops ieee80211_crypt_null = {
.owner = THIS_MODULE,
};
.owner = THIS_MODULE,
};
-int
__init
ieee80211_crypto_init(void)
+int ieee80211_crypto_init(void)
{
int ret = -ENOMEM;
{
int ret = -ENOMEM;
@@
-221,7
+220,7
@@
out:
return ret;
}
return ret;
}
-void
__exit
ieee80211_crypto_deinit(void)
+void ieee80211_crypto_deinit(void)
{
struct list_head *ptr, *n;
struct ieee80211_crypto_alg *alg = NULL;
{
struct list_head *ptr, *n;
struct ieee80211_crypto_alg *alg = NULL;