kernel: take bcm47xx_nvram.h from kernel and not backports
authorJohn Crispin <blogic@openwrt.org>
Tue, 1 Mar 2016 08:14:34 +0000 (08:14 +0000)
committerJohn Crispin <blogic@openwrt.org>
Tue, 1 Mar 2016 08:14:34 +0000 (08:14 +0000)
commitfda357882da312f41889e5a582a04ac327e86e71
treefe65fcfaf5822be9b12f0fcbab42d7a1e4afa423
parent6a867d436830bb8922abe798b1acc51aff53e05c
kernel: take bcm47xx_nvram.h from kernel and not backports

compat-wireless/backports now contains a bcm47xx_nvram.h file to
backport some of the functions in it which are used by the bcmfmac
driver. This file just checks for the kernel versions and provide an
empty implementations on older kernel versions. This is OK on most
systems, but on bcm47xx / bcm53xx systems we want to call the real
functions here. This commit removes the file from backports in our
build process like we do it with the bcma and ssb header files. Instead
we add a recent version into our kernel so all code uses only one
header file. On bcm47xx / bcm53xx the real implementations of this code
will be used.

Reported-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
[Backport of r47467. The recent mac80211 backport was missing this patch,
breaking the build of the brcmfmac module]
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48831 3c298f89-4303-0410-b956-a3cf2f4a3e73
target/linux/bcm53xx/files/include/linux/bcm47xx_nvram.h [deleted file]
target/linux/brcm47xx/patches-3.18/031-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
target/linux/generic/patches-3.18/030-backport_bcm47xx_nvram.patch [new file with mode: 0644]