2006-10-17 10:38:33

by Yi CDL Yang

[permalink] [raw]
Subject: [PATCH 2.6.19-rc2]: Fix protdrv_pci.c compile error

When CONFIG_PM isn't set, the compiler will report the following error:

drivers/built-in.o: In function `.pcie_portdrv_slot_reset':
portdrv_pci.c:(.text+0xa80c): undefined reference to `.pcie_portdrv_restore_config'
make: *** [.tmp_vmlinux1] Error 1

The problem is that pcie_portdrv_restore_config isn't defiend when PM is disabled.


This patch fixes this problem, please consider to apply, thanks.

Signed-off by Yi Yang <[email protected]>

--- a/drivers/pci/pcie/portdrv_pci.c 2006-10-13 12:25:04.000000000 -0400
+++ b/drivers/pci/pcie/portdrv_pci.c 2006-10-16 18:49:43.000000000 -0400
@@ -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);