From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
netdev <netdev@vger.kernel.org>,
linux-pci@vger.kernel.org, linux-next@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
davem@davemloft.net, Sakari Ailus <sakari.ailus@iki.fi>
Subject: Re: [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled
Date: Wed, 16 Feb 2011 11:46:19 -0800 [thread overview]
Message-ID: <20110216114619.7fbfb3cf@jbarnes-desktop> (raw)
In-Reply-To: <20110214122750.e1e03bc8.randy.dunlap@oracle.com>
On Mon, 14 Feb 2011 12:27:50 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> When CONFIG_PCI is not enabled, tlan.c has a build error:
> drivers/net/tlan.c:503: error: implicit declaration of function 'pci_wake_from_d3'
>
> so add an inline function stub for this function to pci.h when
> PCI is not enabled, similar to other stubbed PCI functions.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Sakari Ailus <sakari.ailus@iki.fi>
> ---
> include/linux/pci.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> --- 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)
> {
>
Applied to linux-next, thanks guys.
--
Jesse Barnes, Intel Open Source Technology Center
prev parent reply other threads:[~2011-02-16 19:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110214181137.ee8d4c08.sfr@canb.auug.org.au>
2011-02-14 20:27 ` [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled Randy Dunlap
2011-02-14 20:39 ` David Miller
2011-02-14 21:32 ` Sakari Ailus
2011-02-14 22:02 ` Sakari Ailus
2011-02-16 19:46 ` Jesse Barnes [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110216114619.7fbfb3cf@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=sakari.ailus@iki.fi \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).