From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "Jay Cliburn" <jcliburn@gmail.com>,
"Chris Snook" <chris.snook@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
"Jiri Pirko" <jiri@resnulli.us>,
"Benoit Taine" <benoit.taine@lip6.fr>,
"Fabian Frederick" <fabf@skynet.be>,
"Bjorn Helgaas" <bhelgaas@google.com>,
=?UTF-8?q?fran=C3=A7ois=20romieu?= <romieu@fr.zoreil.com>,
"Wilfried Klaebe" <w-lkml@lebenslange-mailadresse.de>,
"Julia Lawall" <julia.lawall@lip6.fr>,
netdev@vger.kernel.org
Subject: [PATCH 54/86] atheros/atlx: use uapi/linux/pci_ids.h directly
Date: Sun, 29 Mar 2015 15:41:28 +0200 [thread overview]
Message-ID: <1427635734-24786-55-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1427635734-24786-1-git-send-email-mst@redhat.com>
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h,
use the new header directly so we can drop
the wrapper in include/linux/pci_ids.h.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index eca1d11..774667b 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -67,7 +67,7 @@
#include <linux/net.h>
#include <linux/netdevice.h>
#include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/pm.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 46a5353..bdb9dfe 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -36,7 +36,7 @@
#include <linux/net.h>
#include <linux/netdevice.h>
#include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/pm.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
--
MST
next parent reply other threads:[~2015-03-29 13:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1427635734-24786-1-git-send-email-mst@redhat.com>
2015-03-29 13:41 ` Michael S. Tsirkin [this message]
2015-03-29 13:41 ` [PATCH 55/86] chelsio/cxgb: use uapi/linux/pci_ids.h directly Michael S. Tsirkin
2015-03-29 13:41 ` [PATCH 56/86] intel/ixgb: " Michael S. Tsirkin
2015-03-29 23:55 ` Jeff Kirsher
2015-03-30 5:30 ` Stephen Hemminger
2015-03-30 19:04 ` Jeff Kirsher
2015-03-29 13:41 ` [PATCH 57/86] brcm80211: " Michael S. Tsirkin
[not found] ` <1427635734-24786-58-git-send-email-mst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-03-29 16:45 ` Arend van Spriel
2015-03-29 13:43 ` [PATCH 83/86] brcm80211: drop pci dependency Michael S. Tsirkin
2015-03-29 16:46 ` Arend van Spriel
2015-03-29 13:43 ` [PATCH 84/86] brcm80211: drop pci_ids include Michael S. Tsirkin
[not found] ` <1427635734-24786-85-git-send-email-mst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-03-29 16:47 ` Arend van Spriel
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=1427635734-24786-55-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=benoit.taine@lip6.fr \
--cc=bhelgaas@google.com \
--cc=chris.snook@gmail.com \
--cc=davem@davemloft.net \
--cc=fabf@skynet.be \
--cc=jcliburn@gmail.com \
--cc=jiri@resnulli.us \
--cc=julia.lawall@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=romieu@fr.zoreil.com \
--cc=w-lkml@lebenslange-mailadresse.de \
/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).