2006-10-24 15:53:11

by Arnd Bergmann

Subject: [PATCH] fix building pcie portdrv_pci.c without CONFIG_PM

pcie_portdrv_restore_config is now also used outside of
CONFIG_PM.

Signed-off-by: Arnd Bergmann <[email protected]>

--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/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);

2006-10-24 23:03:21

by Paul Mackerras

Subject: Re: [PATCH] fix building pcie portdrv_pci.c without CONFIG_PM

Arnd Bergmann writes:

> pcie_portdrv_restore_config is now also used outside of
> CONFIG_PM.

That's upstream already...

Paul.