Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964938AbWJJDuK (ORCPT ); Mon, 9 Oct 2006 23:50:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964939AbWJJDuK (ORCPT ); Mon, 9 Oct 2006 23:50:10 -0400 Received: from ausmtp04.au.ibm.com ([202.81.18.152]:9102 "EHLO ausmtp04.au.ibm.com") by vger.kernel.org with ESMTP id S964938AbWJJDuI (ORCPT ); Mon, 9 Oct 2006 23:50:08 -0400 Subject: [PATCH] Fix pcie portdrv build without CONFIG_PM From: Benjamin Herrenschmidt To: "Tom Long Nguyen (tom.l.nguyen"@intel.com Cc: Andrew Morton , Linux Kernel list , Greg KH Content-Type: text/plain Date: Tue, 10 Oct 2006 13:49:47 +1000 Message-Id: <1160452187.32237.90.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.8.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1200 Lines: 33 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 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/