summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 19:20:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 21:43:58 +0100
commit9306a8b0c29e11d823b258f5796353a4fe3e3be3 (patch)
tree922c31dc1f08072e9fe2e65e753efa7c85c13e89 /drivers/misc
parentmei: Simplify the ME client enumeration code (diff)
downloadlinux-9306a8b0c29e11d823b258f5796353a4fe3e3be3.tar.xz
linux-9306a8b0c29e11d823b258f5796353a4fe3e3be3.zip
mei: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 7c9c381e5c9a..f432b8d7e19b 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -1023,8 +1023,8 @@ static struct pci_driver mei_driver = {
.name = KBUILD_MODNAME,
.id_table = mei_pci_tbl,
.probe = mei_probe,
- .remove = __devexit_p(mei_remove),
- .shutdown = __devexit_p(mei_remove),
+ .remove = mei_remove,
+ .shutdown = mei_remove,
.driver.pm = MEI_PM_OPS,
};