From bd90749588725c1f0450de23e5a27e8b28175b80 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:22:08 -0500 Subject: [PATCH] --- yaml --- r: 338067 b: refs/heads/master c: 19fc6b57db3f1522259363d88b1908dc814e0aa5 h: refs/heads/master i: 338065: a6f6ca8d67a9e6552611c72813ff3b7de023de89 338063: 622c3baf8e6c72ee1e1e5094755f62e257fe8326 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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;