The patch titled
CONFIG_PM=n slim: drivers/scsi/sata_sil.c~git-libata-all drivers/scsi/sata_sil24.c~git-libata-all drivers/scsi/sata_sil24.c~origin
has been removed from the -mm tree. Its filename is
config_pm=n-slim-drivers-scsi-sata_sil.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: CONFIG_PM=n slim: drivers/scsi/sata_sil.c~git-libata-all drivers/scsi/sata_sil24.c~git-libata-all drivers/scsi/sata_sil24.c~origin
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ata/sata_sil.c | 6 ++++++
drivers/ata/sata_sil24.c | 6 ++++++
2 files changed, 12 insertions(+)
diff -puN drivers/ata/sata_sil.c~config_pm=n-slim-drivers-scsi-sata_sil drivers/ata/sata_sil.c
--- a/drivers/ata/sata_sil.c~config_pm=n-slim-drivers-scsi-sata_sil
+++ a/drivers/ata/sata_sil.c
@@ -109,7 +109,9 @@ enum {
};
static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
+#ifdef CONFIG_PM
static int sil_pci_device_resume(struct pci_dev *pdev);
+#endif
static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);
static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
@@ -157,8 +159,10 @@ static struct pci_driver sil_pci_driver
.id_table = sil_pci_tbl,
.probe = sil_init_one,
.remove = ata_pci_remove_one,
+#ifdef CONFIG_PM
.suspend = ata_pci_device_suspend,
.resume = sil_pci_device_resume,
+#endif
};
static struct scsi_host_template sil_sht = {
@@ -696,6 +700,7 @@ err_out:
return rc;
}
+#ifdef CONFIG_PM
static int sil_pci_device_resume(struct pci_dev *pdev)
{
struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
@@ -707,6 +712,7 @@ static int sil_pci_device_resume(struct
return 0;
}
+#endif
static int __init sil_init(void)
{
diff -puN drivers/ata/sata_sil24.c~config_pm=n-slim-drivers-scsi-sata_sil drivers/ata/sata_sil24.c
--- a/drivers/ata/sata_sil24.c~config_pm=n-slim-drivers-scsi-sata_sil
+++ a/drivers/ata/sata_sil24.c
@@ -339,7 +339,9 @@ static int sil24_port_start(struct ata_p
static void sil24_port_stop(struct ata_port *ap);
static void sil24_host_stop(struct ata_host_set *host_set);
static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
+#ifdef CONFIG_PM
static int sil24_pci_device_resume(struct pci_dev *pdev);
+#endif
static const struct pci_device_id sil24_pci_tbl[] = {
{ 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
@@ -355,8 +357,10 @@ static struct pci_driver sil24_pci_drive
.id_table = sil24_pci_tbl,
.probe = sil24_init_one,
.remove = ata_pci_remove_one, /* safe? */
+#ifdef CONFIG_PM
.suspend = ata_pci_device_suspend,
.resume = sil24_pci_device_resume,
+#endif
};
static struct scsi_host_template sil24_sht = {
@@ -1184,6 +1188,7 @@ static int sil24_init_one(struct pci_dev
return rc;
}
+#ifdef CONFIG_PM
static int sil24_pci_device_resume(struct pci_dev *pdev)
{
struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
@@ -1202,6 +1207,7 @@ static int sil24_pci_device_resume(struc
return 0;
}
+#endif
static int __init sil24_init(void)
{
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
fix-docs-for-fssuid_dumpable-6145.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
agph-constify-struct-agp_bridge_dataversion.patch
ks0127-wire-up-i2c_add_driver-return-value.patch
config_pm=n-slim-drivers-ieee1394-ohci1394c.patch
git-libata-all.patch
git-netdev-all.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
turn-usb_resume_both-into-static-inline.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
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
remove-null-check-in-register_nls.patch
config_pm=n-slim-drivers-ide-pci-sc1200c.patch
fs-kconfig-split-ext2.patch
fs-kconfig-split-ext3.patch
fs-kconfig-split-jbd.patch
fs-kconfig-split-reiserfs.patch
fs-kconfig-split-jfs.patch
fs-kconfig-split-ocfs2.patch
fs-kconfig-split-minix.patch
fs-kconfig-split-romfs.patch
fs-kconfig-split-autofs.patch
fs-kconfig-split-autofs4.patch
fs-kconfig-split-fuse.patch
fs-kconfig-split-isofs.patch
fs-kconfig-split-udf.patch
fs-kconfig-split-fat.patch
fs-kconfig-split-msdos.patch
fs-kconfig-split-vfat.patch
fs-kconfig-split-ntfs.patch
fs-kconfig-split-proc.patch
fs-kconfig-split-sysfs.patch
fs-kconfig-split-hugetlbfs.patch
fs-kconfig-split-ramfs.patch
fs-kconfig-split-configfs.patch
fs-kconfig-split-adfs.patch
fs-kconfig-split-affs.patch
fs-kconfig-split-ecryptfs.patch
fs-kconfig-split-hfs.patch
fs-kconfig-split-hfsplus.patch
fs-kconfig-split-befs.patch
fs-kconfig-split-bfs.patch
fs-kconfig-split-efs.patch
fs-kconfig-split-jffs.patch
fs-kconfig-split-jffs2.patch
fs-kconfig-split-cramfs.patch
fs-kconfig-split-freevxfs.patch
fs-kconfig-split-hpfs.patch
fs-kconfig-split-qnx4.patch
fs-kconfig-split-sysv.patch
fs-kconfig-split-ufs.patch
fs-kconfig-split-smbfs.patch
fs-kconfig-split-cifs.patch
fs-kconfig-split-ncpfs.patch
fs-kconfig-split-coda.patch
fs-kconfig-split-afs.patch
fs-kconfig-split-9p.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
