The new error handling code uses pcie_portdrv_restore_config() outside
of CONFIG_PM so this function must be moved outside of the #ifdef or it
will get a link error if CONFIG_PM is not set.
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Index: linux-cell/drivers/pci/pcie/portdrv_pci.c
===================================================================
--- linux-cell.orig/drivers/pci/pcie/portdrv_pci.c 2006-10-06 13:48:12.000000000 +1000
+++ linux-cell/drivers/pci/pcie/portdrv_pci.c 2006-10-10 13:46:43.000000000 +1000
@@ -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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
