The patch titled
pcie_portdrv_restore_config undefined without CONFIG_PM
has been added to the -mm tree. Its filename is
pcie_portdrv_restore_config-undefined-without-config_pm.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pcie_portdrv_restore_config undefined without CONFIG_PM
From: "Zhang, Yanmin" <yanmin_zhang@xxxxxxxxxxxxxxx>
PCI-Express AER implemetation: pcie_portdrv error handler
This patch breaks if CONFIG_PM is not enabled,
pcie_portdrv_restore_config() will be undefined.
Move the definition of pcie_portdrv_restore_config out of CONFIG_PM.
Signed-off-by: Zhang Yanmin <yanmin.zhang@xxxxxxxxx>
Cc: Olaf Hering <olaf@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pci/pcie/portdrv_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/pci/pcie/portdrv_pci.c~pcie_portdrv_restore_config-undefined-without-config_pm drivers/pci/pcie/portdrv_pci.c
--- a/drivers/pci/pcie/portdrv_pci.c~pcie_portdrv_restore_config-undefined-without-config_pm
+++ a/drivers/pci/pcie/portdrv_pci.c
@@ -37,7 +37,6 @@ static int pcie_portdrv_save_config(stru
return pci_save_state(dev);
}
-#ifdef CONFIG_PM
static int pcie_portdrv_restore_config(struct pci_dev *dev)
{
int retval;
@@ -50,6 +49,7 @@ static int pcie_portdrv_restore_config(s
return 0;
}
+#ifdef CONFIG_PM
static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
{
int ret = pcie_port_device_suspend(dev, state);
_
Patches currently in -mm which might be from yanmin_zhang@xxxxxxxxxxxxxxx are
origin.patch
pcie_portdrv_restore_config-undefined-without-config_pm.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
