From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "Brett Rudley" <brudley@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>,
"Franky (Zhenhui) Lin" <frankyl@broadcom.com>,
"Hante Meuleman" <meuleman@broadcom.com>,
"Kalle Valo" <kvalo@codeaurora.org>,
"Pieter-Paul Giesberts" <pieterpg@broadcom.com>,
"John W. Linville" <linville@tuxdriver.com>,
"Mika Westerberg" <mika.westerberg@linux.intel.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Daniel (Deognyoun) Kim" <dekim@broadcom.com>,
=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>,
"Julia Lawall" <Julia.Lawall@lip6.fr>,
"Brian Norris" <computersforpeace@gmail.com>,
"Dan Carpenter" <dan.carpenter@oracle.com>,
"Markus Elfring" <elfring@users.sourceforge.net>,
linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com,
netdev@vger.kernel.org
Subject: [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly
Date: Sun, 29 Mar 2015 15:41:44 +0200 [thread overview]
Message-ID: <1427635734-24786-58-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/wireless/brcm80211/include/brcm_hw_ids.h | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 2 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 2124a17..bd1370e 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -17,7 +17,7 @@
#ifndef _BRCM_HW_IDS_H_
#define _BRCM_HW_IDS_H_
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/mmc/sdio_ids.h>
#define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 7944224..227cb33 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -18,7 +18,7 @@
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/sched.h>
#include <linux/completion.h>
#include <linux/scatterlist.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index faec35c..5c4755d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -18,7 +18,7 @@
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/printk.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index eb8584a..de0ef7bb 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -17,7 +17,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/if_ether.h>
#include <net/cfg80211.h>
#include <net/mac80211.h>
--
MST
next prev 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 ` [PATCH 54/86] atheros/atlx: use uapi/linux/pci_ids.h directly Michael S. Tsirkin
2015-03-29 13:41 ` [PATCH 55/86] chelsio/cxgb: " 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 ` Michael S. Tsirkin [this message]
[not found] ` <1427635734-24786-58-git-send-email-mst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-03-29 16:45 ` [PATCH 57/86] brcm80211: " 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-58-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=Julia.Lawall@lip6.fr \
--cc=arend@broadcom.com \
--cc=brcm80211-dev-list@broadcom.com \
--cc=brudley@broadcom.com \
--cc=computersforpeace@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=dekim@broadcom.com \
--cc=elfring@users.sourceforge.net \
--cc=frankyl@broadcom.com \
--cc=hdegoede@redhat.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=meuleman@broadcom.com \
--cc=mika.westerberg@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=pieterpg@broadcom.com \
--cc=zajec5@gmail.com \
/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).