From 99473451c3b6c9913fed995202d00568aafebe32 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Date: Thu, 19 Jun 2014 09:40:09 -0400
Subject: [PATCH 317/414] Revert "drivers/net: tulip_remove_one needs to call
 pci_disable_device()"

This reverts commit 4a77edc195f0b03644e84dda00fcfe9827868e8e.

This commit was added to the -rt tree and submitted to stable. But because
the stable version inserted pci_disable_device() in a slightly different
location, when stable was merged it caused this to be duplicated.

Remove the version that was added to -rt and keep the stable one.

Link: http://lkml.kernel.org/r/1403149603.5189.10.camel@marge.simpson.net

Reported-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 drivers/net/ethernet/dec/tulip/tulip_core.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index a6d4653ebbc3..779016068a82 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev)
 	pci_iounmap(pdev, tp->base_addr);
 	free_netdev (dev);
 	pci_release_regions (pdev);
-	pci_disable_device(pdev);
 	pci_set_drvdata (pdev, NULL);
 	pci_disable_device(pdev);
 
-- 
2.10.2

