lkml.org 
[lkml]   [2015]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly
    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


    \
     
     \ /
      Last update: 2015-03-29 19:21    [W:4.037 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site