The patch titled
CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
has been removed from the -mm tree. Its filename is
config_pm=n-slim-drivers-ieee1394-ohci1394c.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/ohci1394.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/ieee1394/ohci1394.c~config_pm=n-slim-drivers-ieee1394-ohci1394c drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/ohci1394.c~config_pm=n-slim-drivers-ieee1394-ohci1394c
+++ a/drivers/ieee1394/ohci1394.c
@@ -3530,7 +3530,7 @@ static void ohci1394_pci_remove(struct p
put_device(dev);
}
-
+#ifdef CONFIG_PM
static int ohci1394_pci_resume (struct pci_dev *pdev)
{
#ifdef CONFIG_PPC_PMAC
@@ -3568,7 +3568,7 @@ static int ohci1394_pci_suspend (struct
return 0;
}
-
+#endif
#define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10)
@@ -3591,8 +3591,10 @@ static struct pci_driver ohci1394_pci_dr
.id_table = ohci1394_pci_tbl,
.probe = ohci1394_pci_probe,
.remove = ohci1394_pci_remove,
+#ifdef CONFIG_PM
.resume = ohci1394_pci_resume,
.suspend = ohci1394_pci_suspend,
+#endif
};
/***********************************
_
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
git-alsa.patch
git-agpgart.patch
git-dvb.patch
git-ieee1394.patch
git-libata-all.patch
git-net.patch
config_pm=n-slim-drivers-pcmcia.patch
i82092-wire-up-errors-from-pci_register_driver.patch
config_pm=n-slim-drivers-serial-8250_pcic.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.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
windfarm_smu_satc-simplify-around-i2c_add_driver.patch
cramfs-rewrite-init_cramfs_fs.patch
freevxfs-fix-leak-on-error-path.patch
cramfs-make-cramfs_uncompress_exit-return-void.patch
9p-fix-leak-on-error-path.patch
ban-register_filesystemnull.patch
jbd-use-build_bug_on-in-journal-init.patch
really-ignore-kmem_cache_destroy-return-value.patch
make-kmem_cache_destroy-return-void.patch
documentation-submittingdrivers-minor-update.patch
kmemdup-introduce.patch
kmemdup-some-users.patch
create-fs-utimesc.patch
proper-flags-type-of-spin_lock_irqsave.patch
remove-null-check-in-register_nls.patch
make-kmem_cache_destroy-return-void-ecryptfs.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
