diff --git a/[refs] b/[refs] index eb0479ea787c..a78b3770ddc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1387b461af6a5802a79bbeaed048c732a05f3735 +refs/heads/master: a4a557e3d44f509a807e80334f012b36ba6894c6 diff --git a/trunk/drivers/staging/rtl8192u/r8192U_core.c b/trunk/drivers/staging/rtl8192u/r8192U_core.c index 12572fa3a367..56367f23112f 100644 --- a/trunk/drivers/staging/rtl8192u/r8192U_core.c +++ b/trunk/drivers/staging/rtl8192u/r8192U_core.c @@ -146,7 +146,7 @@ MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI"); static int rtl8192_usb_probe(struct usb_interface *intf, const struct usb_device_id *id); -static void __devexit rtl8192_usb_disconnect(struct usb_interface *intf); +static void rtl8192_usb_disconnect(struct usb_interface *intf); static struct usb_driver rtl8192_usb_driver = { @@ -5826,7 +5826,7 @@ void rtl8192_cancel_deferred_work(struct r8192_priv* priv) } -static void __devexit rtl8192_usb_disconnect(struct usb_interface *intf) +static void rtl8192_usb_disconnect(struct usb_interface *intf) { struct net_device *dev = usb_get_intfdata(intf);