1 files changed, 2 insertions, 16 deletions

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index fb0b40a191c2..616a6d2ac20c 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -774,20 +774,6 @@ static int sata_fsl_port_start(struct ata_port *ap)
         VPRINTK("HControl = 0x%x\n", ioread32(hcr_base + HCONTROL));
         VPRINTK("CHBA  = 0x%x\n", ioread32(hcr_base + CHBA));
 
-#ifdef CONFIG_MPC8315_DS
-        /*
-         * Workaround for 8315DS board 3gbps link-up issue,
-         * currently limit SATA port to GEN1 speed
-         */
-        sata_fsl_scr_read(&ap->link, SCR_CONTROL, &temp);
-        temp &= ~(0xF << 4);
-        temp |= (0x1 << 4);
-        sata_fsl_scr_write(&ap->link, SCR_CONTROL, temp);
-
-        sata_fsl_scr_read(&ap->link, SCR_CONTROL, &temp);
-        dev_warn(dev, "scr_control, speed limited to %x\n", temp);
-#endif
-
         return 0;
 }
 
@@ -1588,7 +1574,7 @@ static int sata_fsl_remove(struct platform_device *ofdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int sata_fsl_suspend(struct platform_device *op, pm_message_t state)
 {
         struct ata_host *host = platform_get_drvdata(op);
@@ -1644,7 +1630,7 @@ static struct platform_driver fsl_sata_driver = {
         },
         .probe          = sata_fsl_probe,
         .remove         = sata_fsl_remove,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         .suspend        = sata_fsl_suspend,
         .resume         = sata_fsl_resume,
 #endif