From a6f6ca8d67a9e6552611c72813ff3b7de023de89 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:22:04 -0500 Subject: [PATCH] --- yaml --- r: 338065 b: refs/heads/master c: 2579452a6deff806d06f5ebb7ae1e8d51c39c9d3 h: refs/heads/master i: 338063: 622c3baf8e6c72ee1e1e5094755f62e257fe8326 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192u/r8192U_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a884217baa62..e1c5f5319dba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c08561c5cffa7053aeb47aac6d39bb1fa38f0248 +refs/heads/master: 2579452a6deff806d06f5ebb7ae1e8d51c39c9d3 diff --git a/trunk/drivers/staging/rtl8192u/r8192U_core.c b/trunk/drivers/staging/rtl8192u/r8192U_core.c index 5a2fab9fa772..12572fa3a367 100644 --- a/trunk/drivers/staging/rtl8192u/r8192U_core.c +++ b/trunk/drivers/staging/rtl8192u/r8192U_core.c @@ -144,7 +144,7 @@ MODULE_PARM_DESC(ifname," Net interface name, wlan%d=default"); MODULE_PARM_DESC(hwwep," Try to use hardware security support. "); MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI"); -static int __devinit rtl8192_usb_probe(struct usb_interface *intf, +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); @@ -5739,7 +5739,7 @@ static const struct net_device_ops rtl8192_netdev_ops = { ---------------------------- USB_STUFF--------------------------- *****************************************************************************/ -static int __devinit rtl8192_usb_probe(struct usb_interface *intf, +static int rtl8192_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) { // unsigned long ioaddr = 0;