The patch titled
CONFIG_PM=n slim: drivers/serial/8250_pci.c
has been added to the -mm tree. Its filename is
config_pm=n-slim-drivers-serial-8250_pcic.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: CONFIG_PM=n slim: drivers/serial/8250_pci.c
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/serial/8250_pci.c | 4 ++++
1 files changed, 4 insertions(+)
diff -puN drivers/serial/8250_pci.c~config_pm=n-slim-drivers-serial-8250_pcic drivers/serial/8250_pci.c
--- a/drivers/serial/8250_pci.c~config_pm=n-slim-drivers-serial-8250_pcic
+++ a/drivers/serial/8250_pci.c
@@ -1783,6 +1783,7 @@ static void __devexit pciserial_remove_o
pci_disable_device(dev);
}
+#ifdef CONFIG_PM
static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
{
struct serial_private *priv = pci_get_drvdata(dev);
@@ -1812,6 +1813,7 @@ static int pciserial_resume_one(struct p
}
return 0;
}
+#endif
static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
@@ -2362,8 +2364,10 @@ static struct pci_driver serial_pci_driv
.name = "serial",
.probe = pciserial_init_one,
.remove = __devexit_p(pciserial_remove_one),
+#ifdef CONFIG_PM
.suspend = pciserial_suspend_one,
.resume = pciserial_resume_one,
+#endif
.id_table = serial_pci_tbl,
};
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
config_pm=n-slim-drivers-media-video.patch
config_pm=n-slim-drivers-ieee1394-ohci1394c.patch
config_pm=n-slim-drivers-scsi-sata_sil.patch
config_pm=n-slim-drivers-pcmcia.patch
config_pm=n-slim-drivers-serial-8250_pcic.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.patch
sh-fix-fpn_start-typo.patch
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
task_struct-ifdef-missedem-v-ipc.patch
ifdef-blktrace-debugging-fields.patch
tty_ioc-keep-davej-sane.patch
ifdef-quota_read-quota_write.patch
reiserfs-ifdef-xattr_sem.patch
reiserfs-ifdef-acl-stuff-from-inode.patch
fsh-ifdef-security-fields.patch
config_pm=n-slim-drivers-parport-parport_serialc.patch
config_pm=n-slim-sound-oss-tridentc.patch
config_pm=n-slim-sound-oss-cs46xxc.patch
config_pm=n-slim-drivers-ide-pci-sc1200c.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
ioctl-messtxt-xfs-typos.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
