From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shuah Khan Subject: [PATCH] net/wireless/brcm80211: remove PCI_BUS define from defs.h to fix warnings Date: Mon, 04 Mar 2013 18:02:54 -0700 Message-ID: <1362445374.4591.28.camel@lorien2> Reply-To: shuah.khan@hp.com Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com, netdev@vger.kernel.org, LKML , shuahkhan@gmail.com To: brudley@broadcom.com, arend@broadcom.com, frankyl@broadcom.com, linville@tuxdriver.com, seth.forshee@canonical.com, pieterpg@broadcom.com Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org PCI_BUS defined in defs.h results in warnings from all brcm80211 source files including defs.h. This define is not used in brcm80211. Removing this define fixes the warning. In file included from drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:35:0: drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default] include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition CC [M] drivers/net/wireless/b43legacy/dma.o CC [M] drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.o CC [M] drivers/net/wireless/b43legacy/pio.o In file included from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0: drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default] include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition In file included from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:29:0: drivers/net/wireless/brcm80211/include/defs.h:23:0: warning: "PCI_BUS" redefined [enabled by default] include/uapi/linux/pci.h:36:0: note: this is the location of the previous definition Signed-off-by: Shuah Khan --- drivers/net/wireless/brcm80211/include/defs.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h index fb7cbcf..3608436 100644 --- a/drivers/net/wireless/brcm80211/include/defs.h +++ b/drivers/net/wireless/brcm80211/include/defs.h @@ -20,7 +20,6 @@ #include #define SI_BUS 0 -#define PCI_BUS 1 #define PCMCIA_BUS 2 #define SDIO_BUS 3 #define JTAG_BUS 4 -- 1.7.9.5