diff --git a/[refs] b/[refs] index 5a1488072eb0..0799cea95230 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c506fff1ff06cca59a2c5dfef6fad3357eb0908e +refs/heads/master: 19fc6b57db3f1522259363d88b1908dc814e0aa5 diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index ca097e450642..3527ff73332f 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -74,7 +74,7 @@ module_param(hwwep, int, S_IRUGO|S_IWUSR); MODULE_PARM_DESC(hwwep, " Try to use hardware WEP support. Still broken and not available on all cards"); -static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, +static int rtl8180_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id); static void __devexit rtl8180_pci_remove(struct pci_dev *pdev); @@ -3175,7 +3175,7 @@ static const struct net_device_ops rtl8180_netdev_ops = { .ndo_start_xmit = ieee80211_rtl_xmit, }; -static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, +static int rtl8180_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { unsigned long ioaddr = 0;