Merge branch 'sh/sdio' into sh-latest

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index e72f49d52202..07e9796fead7 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -828,14 +828,9 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
 static int agp_intel_resume(struct pci_dev *pdev)
 {
         struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
-        int ret_val;
 
         bridge->driver->configure();
 
-        ret_val = agp_rebind_memory();
-        if (ret_val != 0)
-                return ret_val;
-
         return 0;
 }
 #endif