| Message ID | 1427635734-24786-58-git-send-email-mst@redhat.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On 03/29/15 15:41, Michael S. Tsirkin wrote: > 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. Acked-by: Arend van Spriel <arend@broadcom.com> > 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> I was surprised seeing this include here, but you deal with that in subsequent patches. Thanks. Regards, Arend -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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>
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(-)