From patchwork Mon Feb 14 20:27:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 556841 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 p1EKSBZ9025210 for ; Mon, 14 Feb 2011 20:28:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751079Ab1BNU2K (ORCPT ); Mon, 14 Feb 2011 15:28:10 -0500 Received: from rcsinet10.oracle.com ([148.87.113.121]:27930 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750843Ab1BNU2I (ORCPT ); Mon, 14 Feb 2011 15:28:08 -0500 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id p1EKRsKo014895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 14 Feb 2011 20:27:55 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id p1EKRqmN022767; Mon, 14 Feb 2011 20:27:53 GMT Received: from abhmt008.oracle.com by acsmt354.oracle.com with ESMTP id 1052897451297715272; Mon, 14 Feb 2011 12:27:52 -0800 Received: from chimera.site (/173.50.240.230) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 14 Feb 2011 12:27:51 -0800 Date: Mon, 14 Feb 2011 12:27:50 -0800 From: Randy Dunlap To: Stephen Rothwell , netdev , linux-pci@vger.kernel.org Cc: linux-next@vger.kernel.org, LKML , davem@davemloft.net, Jesse Barnes , Sakari Ailus Subject: [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled Message-Id: <20110214122750.e1e03bc8.randy.dunlap@oracle.com> In-Reply-To: <20110214181137.ee8d4c08.sfr@canb.auug.org.au> References: <20110214181137.ee8d4c08.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090206.4D59904A.00D9:SCFMA4539814,ss=1,fgs=0 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]); Mon, 14 Feb 2011 20:28:12 +0000 (UTC) --- linux-next-20110214.orig/include/linux/pci.h +++ linux-next-20110214/include/linux/pci.h @@ -1191,6 +1191,11 @@ static inline int pci_set_power_state(st return 0; } +static inline int pci_wake_from_d3(struct pci_dev *dev, bool enable) +{ + return 0; +} + static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) {