diff --git a/[refs] b/[refs] index 4fc2f0101051..6e7deaa7715f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07f432338accafb2002911a34309d822e168074a +refs/heads/master: eae78ca6896715f05e3db2c47f6ac7cec2904f35 diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c index 93850042514e..72ec73751cc3 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.c +++ b/trunk/drivers/staging/rtl8192e/rtl_core.c @@ -3302,13 +3302,6 @@ static int __init rtl8192_pci_module_init(void) printk(KERN_ERR "rtllib_crypto_wep_init() failed %d\n", ret); return ret; } -#ifdef BUILT_IN_MSHCLASS - ret = msh_init(); - if (ret) { - printk(KERN_ERR "msh_init() failed %d\n", ret); - return ret; - } -#endif printk(KERN_INFO "\nLinux kernel driver for RTL8192E WLAN cards\n"); printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan Driver\n"); @@ -3347,9 +3340,6 @@ static void __exit rtl8192_pci_module_exit(void) michael_mic_exit(); aes_fini(); #endif -#ifdef BUILT_IN_MSHCLASS - msh_exit(); -#endif }