diff --git a/[refs] b/[refs]
index 45b2d77f236f..f85e37095461 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff76a3cca3a2f8664e0625cb4d75601ff9ccde76
+refs/heads/master: 854de92f6d3471e694ea807a52b2670862b15d42
diff --git a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
index ad1468b3ab91..930f03bd1263 100644
--- a/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/trunk/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2275,7 +2275,7 @@ static void enic_iounmap(struct enic *enic)
 			iounmap(enic->bar[i].vaddr);
 }
 
-static int __devinit enic_probe(struct pci_dev *pdev,
+static int enic_probe(struct pci_dev *pdev,
 	const struct pci_device_id *ent)
 {
 	struct device *dev = &pdev->dev;
@@ -2552,7 +2552,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 	return err;
 }
 
-static void __devexit enic_remove(struct pci_dev *pdev)
+static void enic_remove(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
 
@@ -2584,7 +2584,7 @@ static struct pci_driver enic_driver = {
 	.name = DRV_NAME,
 	.id_table = enic_id_table,
 	.probe = enic_probe,
-	.remove = __devexit_p(enic_remove),
+	.remove = enic_remove,
 };
 
 static int __init enic_init_module(void)