diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-12-07 18:03:50 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-07 18:03:50 (GMT) |
commit | 8024dc191025d6b981563236df02da5c0db0854d (patch) | |
tree | f42cd84995c804c3590c56616527f5399155060b /drivers/net/wireless/rtlwifi/usb.h | |
parent | fd3065b25b69ce345073bbd294a73343a608fd8b (diff) | |
parent | 9e2ff36beae4bedbad2a69d458f9404f35fcb528 (diff) | |
download | linux-fsl-qoriq-8024dc191025d6b981563236df02da5c0db0854d.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.h')
-rw-r--r-- | drivers/net/wireless/rtlwifi/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.h b/drivers/net/wireless/rtlwifi/usb.h index 43846b3..5235136 100644 --- a/drivers/net/wireless/rtlwifi/usb.h +++ b/drivers/net/wireless/rtlwifi/usb.h @@ -156,7 +156,7 @@ struct rtl_usb_priv { -int __devinit rtl_usb_probe(struct usb_interface *intf, +int rtl_usb_probe(struct usb_interface *intf, const struct usb_device_id *id); void rtl_usb_disconnect(struct usb_interface *intf); int rtl_usb_suspend(struct usb_interface *pusb_intf, pm_message_t message); |