Re: [PATCH 57/86] brcm80211: use uapi/linux/pci_ids.h directly

From: Arend van Spriel
Date: Sun Mar 29 2015 - 12:46:13 EST


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@xxxxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin<mst@xxxxxxxxxx>
---
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 linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/