---

yaml --- r: 336994 b: refs/heads/master c: 9306a8b h: refs/heads/master v: v3
git-mirror · Nov 21, 2012 · bb6647b · bb6647b
1 parent 9d88dd9
commit bb6647b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1174c0edf546805a0ebc10d5d6154edbb56e1cf
+refs/heads/master: 9306a8b0c29e11d823b258f5796353a4fe3e3be3
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/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,
 };