The patch titled
CONFIG_PM=n slim: drivers/ide/pci/sc1200.c
has been removed from the -mm tree. Its filename is
config_pm=n-slim-drivers-ide-pci-sc1200c.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: CONFIG_PM=n slim: drivers/ide/pci/sc1200.c
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/pci/sc1200.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN drivers/ide/pci/sc1200.c~config_pm=n-slim-drivers-ide-pci-sc1200c drivers/ide/pci/sc1200.c
--- a/drivers/ide/pci/sc1200.c~config_pm=n-slim-drivers-ide-pci-sc1200c
+++ a/drivers/ide/pci/sc1200.c
@@ -323,6 +323,7 @@ static void sc1200_tuneproc (ide_drive_t
}
}
+#ifdef CONFIG_PM
static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev)
{
int h;
@@ -451,6 +452,7 @@ static int sc1200_resume (struct pci_dev
}
return 0;
}
+#endif
/*
* This gets invoked by the IDE driver once for each channel,
@@ -499,8 +501,10 @@ static struct pci_driver driver = {
.name = "SC1200_IDE",
.id_table = sc1200_pci_tbl,
.probe = sc1200_init_one,
+#ifdef CONFIG_PM
.suspend = sc1200_suspend,
.resume = sc1200_resume,
+#endif
};
static int sc1200_ide_init(void)
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
origin.patch
asus_acpi-fix-proc-files-parsing.patch
asus_acpi-dont-printk-on-writing-garbage-to-proc-files.patch
config_pm=n-slim-drivers-pcmcia.patch
i82092-wire-up-errors-from-pci_register_driver.patch
git-scsi-misc.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
