From 6fb1b7c1cd5608b011f3bd90fa84b5bb31fde8fe Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:26:44 -0500 Subject: [PATCH] --- yaml --- r: 338070 b: refs/heads/master c: ea7e9f2a49aa570a08bfb211bf218c98abd6a4c2 h: refs/heads/master 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 f5934e508c49..7db538688920 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83f5789c1023983a564a64be671a95618ea7cc69 +refs/heads/master: ea7e9f2a49aa570a08bfb211bf218c98abd6a4c2 diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index a6520cfbc7ec..c46b59a8197e 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -77,7 +77,7 @@ MODULE_PARM_DESC(hwwep, " Try to use hardware WEP support. Still broken and not 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); +static void rtl8180_pci_remove(struct pci_dev *pdev); static void rtl8180_shutdown(struct pci_dev *pdev) { @@ -3288,7 +3288,7 @@ static int rtl8180_pci_probe(struct pci_dev *pdev, return ret; } -static void __devexit rtl8180_pci_remove(struct pci_dev *pdev) +static void rtl8180_pci_remove(struct pci_dev *pdev) { struct r8180_priv *priv; struct net_device *dev = pci_get_drvdata(pdev);