From patchwork Fri Jan 14 23:07:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 480661 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0EN7s1O015833 for ; Fri, 14 Jan 2011 23:07:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571Ab1ANXHx (ORCPT ); Fri, 14 Jan 2011 18:07:53 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:37751 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474Ab1ANXHw (ORCPT ); Fri, 14 Jan 2011 18:07:52 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 7B32D19F853; Fri, 14 Jan 2011 23:54:21 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26036-05; Fri, 14 Jan 2011 23:54:03 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 5517219AA6F; Fri, 14 Jan 2011 23:54:03 +0100 (CET) From: "Rafael J. Wysocki" To: Jesse Barnes Subject: Re: [git pull] PCI changes (link error) Date: Sat, 15 Jan 2011 00:07:22 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: Markus Trippelsdorf , Linus Torvalds , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org References: <20110114090150.0a212030@jbarnes-desktop> <20110114221300.GA2366@gentoo.trippels.de> <20110114141526.10546dd5@jbarnes-desktop> In-Reply-To: <20110114141526.10546dd5@jbarnes-desktop> MIME-Version: 1.0 Message-Id: <201101150007.23017.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 14 Jan 2011 23:08:16 +0000 (UTC) Index: linux-2.6/include/linux/pci.h =================================================================== --- linux-2.6.orig/include/linux/pci.h +++ linux-2.6/include/linux/pci.h @@ -993,8 +993,13 @@ extern void pci_restore_msi_state(struct extern int pci_msi_enabled(void); #endif +#ifdef CONFIG_PCIEPORTBUS extern bool pcie_ports_disabled; extern bool pcie_ports_auto; +#else +#define pcie_ports_disabled true +#define pcie_ports_auto false +#endif #ifndef CONFIG_PCIEASPM static inline int pcie_aspm_enabled(void)