From ace50fd4497ebe11fa72eff036dc3a95a947898e Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:56:40 -0500 Subject: [PATCH] --- yaml --- r: 342024 b: refs/heads/master c: fb4e899dea7ea5e540db1deb71442d37bb8100fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c4e9de8f2a13..4305cd632c77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 692023597a5ec01fa2e5e3eec36948c7655009f6 +refs/heads/master: fb4e899dea7ea5e540db1deb71442d37bb8100fc diff --git a/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c b/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c index b4218a5f2066..1b3c2843221d 100644 --- a/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/trunk/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -901,7 +901,7 @@ static void rtl8180_eeprom_register_write(struct eeprom_93cx6 *eeprom) udelay(10); } -static int __devinit rtl8180_probe(struct pci_dev *pdev, +static int rtl8180_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct ieee80211_hw *dev; @@ -1131,7 +1131,7 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev, return err; } -static void __devexit rtl8180_remove(struct pci_dev *pdev) +static void rtl8180_remove(struct pci_dev *pdev) { struct ieee80211_hw *dev = pci_get_drvdata(pdev); struct rtl8180_priv *priv; @@ -1170,7 +1170,7 @@ static struct pci_driver rtl8180_driver = { .name = KBUILD_MODNAME, .id_table = rtl8180_table, .probe = rtl8180_probe, - .remove = __devexit_p(rtl8180_remove), + .remove = rtl8180_remove, #ifdef CONFIG_PM .suspend = rtl8180_suspend, .resume = rtl8180_resume,