Commit 23195ec0 authored Jan 16, 2016 by Arend van Spriel Committed by David S. Miller Jan 18, 2016

brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers



With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro
BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance
for the nvram file. This file is not in linux-firmware repo so it may
not be needed anyway. Otherwise consider this as a temporary fix.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Arend van Spriel <aspriel@gmail.com>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e6e4a556

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,7 @@ static const char BRCM_ ## fw_nvram_name ## _FIRMWARE_NAME[] = \
		BRCMF_FW_DEFAULT_PATH fw; \
		static const char BRCM_ ## fw_nvram_name ## _NVRAM_NAME[] = \
		BRCMF_FW_DEFAULT_PATH nvram; \
		MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw); \
		MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH nvram)
		MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw);

		#define BRCMF_FW_DEF(fw_name, fw) \
		static const char BRCM_ ## fw_name ## _FIRMWARE_NAME[] = \